2019-10-16 08:59:30 +00:00
|
|
|
use crate::base::{self, *};
|
2023-02-24 21:37:10 +00:00
|
|
|
use crate::errors;
|
2019-10-16 08:59:30 +00:00
|
|
|
use crate::proc_macro_server;
|
|
|
|
|
2020-11-14 11:47:14 +00:00
|
|
|
use rustc_ast as ast;
|
2020-11-24 19:47:49 +00:00
|
|
|
use rustc_ast::ptr::P;
|
Remove `TreeAndSpacing`.
A `TokenStream` contains a `Lrc<Vec<(TokenTree, Spacing)>>`. But this is
not quite right. `Spacing` makes sense for `TokenTree::Token`, but does
not make sense for `TokenTree::Delimited`, because a
`TokenTree::Delimited` cannot be joined with another `TokenTree`.
This commit fixes this problem, by adding `Spacing` to `TokenTree::Token`,
changing `TokenStream` to contain a `Lrc<Vec<TokenTree>>`, and removing the
`TreeAndSpacing` typedef.
The commit removes these two impls:
- `impl From<TokenTree> for TokenStream`
- `impl From<TokenTree> for TreeAndSpacing`
These were useful, but also resulted in code with many `.into()` calls
that was hard to read, particularly for anyone not highly familiar with
the relevant types. This commit makes some other changes to compensate:
- `TokenTree::token()` becomes `TokenTree::token_{alone,joint}()`.
- `TokenStream::token_{alone,joint}()` are added.
- `TokenStream::delimited` is added.
This results in things like this:
```rust
TokenTree::token(token::Semi, stmt.span).into()
```
changing to this:
```rust
TokenStream::token_alone(token::Semi, stmt.span)
```
This makes the type of the result, and its spacing, clearer.
These changes also simplifies `Cursor` and `CursorRef`, because they no longer
need to distinguish between `next` and `next_with_spacing`.
2022-07-28 00:31:04 +00:00
|
|
|
use rustc_ast::tokenstream::TokenStream;
|
2022-01-23 18:34:26 +00:00
|
|
|
use rustc_errors::ErrorGuaranteed;
|
2024-05-31 03:32:54 +00:00
|
|
|
use rustc_parse::parser::{ForceCollect, Parser};
|
2022-06-18 18:15:03 +00:00
|
|
|
use rustc_session::config::ProcMacroExecutionStrategy;
|
2022-04-01 19:00:51 +00:00
|
|
|
use rustc_span::profiling::SpannedEventArgRecorder;
|
2024-05-26 23:00:48 +00:00
|
|
|
use rustc_span::Span;
|
2019-07-18 18:02:34 +00:00
|
|
|
|
2024-01-08 00:13:04 +00:00
|
|
|
struct MessagePipe<T> {
|
|
|
|
tx: std::sync::mpsc::SyncSender<T>,
|
|
|
|
rx: std::sync::mpsc::Receiver<T>,
|
2022-06-18 18:15:03 +00:00
|
|
|
}
|
|
|
|
|
2024-01-08 00:13:04 +00:00
|
|
|
impl<T> pm::bridge::server::MessagePipe<T> for MessagePipe<T> {
|
2022-06-18 18:15:03 +00:00
|
|
|
fn new() -> (Self, Self) {
|
2024-01-08 00:13:04 +00:00
|
|
|
let (tx1, rx1) = std::sync::mpsc::sync_channel(1);
|
|
|
|
let (tx2, rx2) = std::sync::mpsc::sync_channel(1);
|
|
|
|
(MessagePipe { tx: tx1, rx: rx2 }, MessagePipe { tx: tx2, rx: rx1 })
|
2022-06-18 18:15:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn send(&mut self, value: T) {
|
|
|
|
self.tx.send(value).unwrap();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn recv(&mut self) -> Option<T> {
|
|
|
|
self.rx.recv().ok()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn exec_strategy(ecx: &ExtCtxt<'_>) -> impl pm::bridge::server::ExecutionStrategy {
|
2024-01-08 00:13:04 +00:00
|
|
|
pm::bridge::server::MaybeCrossThread::<MessagePipe<_>>::new(
|
2022-06-18 18:15:03 +00:00
|
|
|
ecx.sess.opts.unstable_opts.proc_macro_execution_strategy
|
|
|
|
== ProcMacroExecutionStrategy::CrossThread,
|
|
|
|
)
|
|
|
|
}
|
2019-07-18 18:02:34 +00:00
|
|
|
|
|
|
|
pub struct BangProcMacro {
|
2022-05-27 17:38:58 +00:00
|
|
|
pub client: pm::bridge::client::Client<pm::TokenStream, pm::TokenStream>,
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
|
2022-05-13 04:07:56 +00:00
|
|
|
impl base::BangProcMacro for BangProcMacro {
|
2019-07-18 18:02:34 +00:00
|
|
|
fn expand<'cx>(
|
|
|
|
&self,
|
|
|
|
ecx: &'cx mut ExtCtxt<'_>,
|
|
|
|
span: Span,
|
|
|
|
input: TokenStream,
|
2022-01-23 18:34:26 +00:00
|
|
|
) -> Result<TokenStream, ErrorGuaranteed> {
|
2022-03-30 13:14:25 +00:00
|
|
|
let _timer =
|
2022-04-01 19:00:51 +00:00
|
|
|
ecx.sess.prof.generic_activity_with_arg_recorder("expand_proc_macro", |recorder| {
|
2023-03-31 04:06:08 +00:00
|
|
|
recorder.record_arg_with_span(ecx.sess.source_map(), ecx.expansion_descr(), span);
|
2022-04-01 19:00:51 +00:00
|
|
|
});
|
|
|
|
|
2021-07-18 19:53:06 +00:00
|
|
|
let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
|
2022-06-18 18:15:03 +00:00
|
|
|
let strategy = exec_strategy(ecx);
|
2021-07-10 20:15:30 +00:00
|
|
|
let server = proc_macro_server::Rustc::new(ecx);
|
2022-06-18 18:15:03 +00:00
|
|
|
self.client.run(&strategy, server, input, proc_macro_backtrace).map_err(|e| {
|
2023-12-18 11:21:37 +00:00
|
|
|
ecx.dcx().emit_err(errors::ProcMacroPanicked {
|
2023-02-24 21:37:10 +00:00
|
|
|
span,
|
|
|
|
message: e
|
|
|
|
.as_str()
|
|
|
|
.map(|message| errors::ProcMacroPanickedHelp { message: message.into() }),
|
|
|
|
})
|
2020-03-17 09:09:18 +00:00
|
|
|
})
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct AttrProcMacro {
|
2022-05-27 17:38:58 +00:00
|
|
|
pub client: pm::bridge::client::Client<(pm::TokenStream, pm::TokenStream), pm::TokenStream>,
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl base::AttrProcMacro for AttrProcMacro {
|
|
|
|
fn expand<'cx>(
|
|
|
|
&self,
|
|
|
|
ecx: &'cx mut ExtCtxt<'_>,
|
|
|
|
span: Span,
|
|
|
|
annotation: TokenStream,
|
|
|
|
annotated: TokenStream,
|
2022-01-23 18:34:26 +00:00
|
|
|
) -> Result<TokenStream, ErrorGuaranteed> {
|
2022-03-30 13:14:25 +00:00
|
|
|
let _timer =
|
2022-04-01 19:00:51 +00:00
|
|
|
ecx.sess.prof.generic_activity_with_arg_recorder("expand_proc_macro", |recorder| {
|
2023-03-31 04:06:08 +00:00
|
|
|
recorder.record_arg_with_span(ecx.sess.source_map(), ecx.expansion_descr(), span);
|
2022-04-01 19:00:51 +00:00
|
|
|
});
|
|
|
|
|
2021-07-18 19:53:06 +00:00
|
|
|
let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
|
2022-06-18 18:15:03 +00:00
|
|
|
let strategy = exec_strategy(ecx);
|
2021-07-10 20:15:30 +00:00
|
|
|
let server = proc_macro_server::Rustc::new(ecx);
|
2022-06-18 18:15:03 +00:00
|
|
|
self.client.run(&strategy, server, annotation, annotated, proc_macro_backtrace).map_err(
|
|
|
|
|e| {
|
2024-02-19 04:02:14 +00:00
|
|
|
ecx.dcx().emit_err(errors::CustomAttributePanicked {
|
|
|
|
span,
|
|
|
|
message: e.as_str().map(|message| errors::CustomAttributePanickedHelp {
|
|
|
|
message: message.into(),
|
|
|
|
}),
|
|
|
|
})
|
2022-06-18 18:15:03 +00:00
|
|
|
},
|
|
|
|
)
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-05-16 01:56:36 +00:00
|
|
|
pub struct DeriveProcMacro {
|
2022-05-27 17:38:58 +00:00
|
|
|
pub client: pm::bridge::client::Client<pm::TokenStream, pm::TokenStream>,
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
|
2022-05-16 01:56:36 +00:00
|
|
|
impl MultiItemModifier for DeriveProcMacro {
|
2019-07-18 18:02:34 +00:00
|
|
|
fn expand(
|
|
|
|
&self,
|
|
|
|
ecx: &mut ExtCtxt<'_>,
|
|
|
|
span: Span,
|
|
|
|
_meta_item: &ast::MetaItem,
|
|
|
|
item: Annotatable,
|
2022-09-20 11:55:07 +00:00
|
|
|
_is_derive_const: bool,
|
2020-03-09 17:50:12 +00:00
|
|
|
) -> ExpandResult<Vec<Annotatable>, Annotatable> {
|
2020-11-24 19:47:49 +00:00
|
|
|
// We need special handling for statement items
|
|
|
|
// (e.g. `fn foo() { #[derive(Debug)] struct Bar; }`)
|
2022-05-01 17:58:24 +00:00
|
|
|
let is_stmt = matches!(item, Annotatable::Stmt(..));
|
2019-07-18 18:02:34 +00:00
|
|
|
|
2024-05-26 23:00:48 +00:00
|
|
|
// We used to have an alternative behaviour for crates that needed it.
|
|
|
|
// We had a lint for a long time, but now we just emit a hard error.
|
|
|
|
// Eventually we might remove the special case hard error check
|
|
|
|
// altogether. See #73345.
|
|
|
|
crate::base::ann_pretty_printing_compatibility_hack(&item, &ecx.sess);
|
|
|
|
let input = item.to_tokens();
|
2022-03-30 13:14:25 +00:00
|
|
|
let stream = {
|
|
|
|
let _timer =
|
2022-04-01 19:00:51 +00:00
|
|
|
ecx.sess.prof.generic_activity_with_arg_recorder("expand_proc_macro", |recorder| {
|
2023-03-31 04:06:08 +00:00
|
|
|
recorder.record_arg_with_span(
|
|
|
|
ecx.sess.source_map(),
|
|
|
|
ecx.expansion_descr(),
|
|
|
|
span,
|
|
|
|
);
|
2022-04-01 19:00:51 +00:00
|
|
|
});
|
2022-03-30 13:14:25 +00:00
|
|
|
let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
|
2022-06-18 18:15:03 +00:00
|
|
|
let strategy = exec_strategy(ecx);
|
2022-03-30 13:14:25 +00:00
|
|
|
let server = proc_macro_server::Rustc::new(ecx);
|
2022-06-18 18:15:03 +00:00
|
|
|
match self.client.run(&strategy, server, input, proc_macro_backtrace) {
|
2022-03-30 13:14:25 +00:00
|
|
|
Ok(stream) => stream,
|
|
|
|
Err(e) => {
|
2024-02-20 06:31:13 +00:00
|
|
|
ecx.dcx().emit_err({
|
|
|
|
errors::ProcMacroDerivePanicked {
|
|
|
|
span,
|
|
|
|
message: e.as_str().map(|message| {
|
|
|
|
errors::ProcMacroDerivePanickedHelp { message: message.into() }
|
|
|
|
}),
|
|
|
|
}
|
|
|
|
});
|
2022-03-30 13:14:25 +00:00
|
|
|
return ExpandResult::Ready(vec![]);
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
2021-07-18 19:53:06 +00:00
|
|
|
}
|
|
|
|
};
|
2019-07-18 18:02:34 +00:00
|
|
|
|
2023-12-18 09:54:03 +00:00
|
|
|
let error_count_before = ecx.dcx().err_count();
|
2024-05-31 03:32:54 +00:00
|
|
|
let mut parser = Parser::new(&ecx.sess.psess, stream, Some("proc-macro derive"));
|
2019-07-18 18:02:34 +00:00
|
|
|
let mut items = vec![];
|
|
|
|
|
|
|
|
loop {
|
2021-01-18 21:47:37 +00:00
|
|
|
match parser.parse_item(ForceCollect::No) {
|
2019-07-18 18:02:34 +00:00
|
|
|
Ok(None) => break,
|
2020-11-24 19:47:49 +00:00
|
|
|
Ok(Some(item)) => {
|
|
|
|
if is_stmt {
|
|
|
|
items.push(Annotatable::Stmt(P(ecx.stmt_item(span, item))));
|
|
|
|
} else {
|
|
|
|
items.push(Annotatable::Item(item));
|
|
|
|
}
|
|
|
|
}
|
Make `DiagnosticBuilder::emit` consuming.
This works for most of its call sites. This is nice, because `emit` very
much makes sense as a consuming operation -- indeed,
`DiagnosticBuilderState` exists to ensure no diagnostic is emitted
twice, but it uses runtime checks.
For the small number of call sites where a consuming emit doesn't work,
the commit adds `DiagnosticBuilder::emit_without_consuming`. (This will
be removed in subsequent commits.)
Likewise, `emit_unless` becomes consuming. And `delay_as_bug` becomes
consuming, while `delay_as_bug_without_consuming` is added (which will
also be removed in subsequent commits.)
All this requires significant changes to `DiagnosticBuilder`'s chaining
methods. Currently `DiagnosticBuilder` method chaining uses a
non-consuming `&mut self -> &mut Self` style, which allows chaining to
be used when the chain ends in `emit()`, like so:
```
struct_err(msg).span(span).emit();
```
But it doesn't work when producing a `DiagnosticBuilder` value,
requiring this:
```
let mut err = self.struct_err(msg);
err.span(span);
err
```
This style of chaining won't work with consuming `emit` though. For
that, we need to use to a `self -> Self` style. That also would allow
`DiagnosticBuilder` production to be chained, e.g.:
```
self.struct_err(msg).span(span)
```
However, removing the `&mut self -> &mut Self` style would require that
individual modifications of a `DiagnosticBuilder` go from this:
```
err.span(span);
```
to this:
```
err = err.span(span);
```
There are *many* such places. I have a high tolerance for tedious
refactorings, but even I gave up after a long time trying to convert
them all.
Instead, this commit has it both ways: the existing `&mut self -> Self`
chaining methods are kept, and new `self -> Self` chaining methods are
added, all of which have a `_mv` suffix (short for "move"). Changes to
the existing `forward!` macro lets this happen with very little
additional boilerplate code. I chose to add the suffix to the new
chaining methods rather than the existing ones, because the number of
changes required is much smaller that way.
This doubled chainging is a bit clumsy, but I think it is worthwhile
because it allows a *lot* of good things to subsequently happen. In this
commit, there are many `mut` qualifiers removed in places where
diagnostics are emitted without being modified. In subsequent commits:
- chaining can be used more, making the code more concise;
- more use of chaining also permits the removal of redundant diagnostic
APIs like `struct_err_with_code`, which can be replaced easily with
`struct_err` + `code_mv`;
- `emit_without_diagnostic` can be removed, which simplifies a lot of
machinery, removing the need for `DiagnosticBuilderState`.
2024-01-03 01:17:35 +00:00
|
|
|
Err(err) => {
|
2020-03-17 10:30:53 +00:00
|
|
|
err.emit();
|
|
|
|
break;
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// fail if there have been errors emitted
|
2023-12-18 09:54:03 +00:00
|
|
|
if ecx.dcx().err_count() > error_count_before {
|
2023-12-18 11:21:37 +00:00
|
|
|
ecx.dcx().emit_err(errors::ProcMacroDeriveTokens { span });
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
|
2020-03-09 17:50:12 +00:00
|
|
|
ExpandResult::Ready(items)
|
2019-07-18 18:02:34 +00:00
|
|
|
}
|
|
|
|
}
|