Skip to content

Proc macro tweaks #97004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 27, 2022
Merged

Proc macro tweaks #97004

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2469ed0
Fix a typo in a comment.
nnethercote May 12, 2022
a61a85e
Add some comments.
nnethercote May 13, 2022
e02789c
Improve formatting in `associated_item!` definition.
nnethercote May 13, 2022
2ece157
Make `Buffer<T>` non-generic.
nnethercote May 12, 2022
1a9514d
Simplify types in `proc_macro_harness.rs`.
nnethercote May 13, 2022
dbdc7dd
Rename `ProcMacro` trait as `BangProcMacro`.
nnethercote May 13, 2022
bc70d0d
Rename `ProcMacroDerive` as `DeriveProcMacro`.
nnethercote May 16, 2022
9a785e0
Clarify a comment.
nnethercote May 13, 2022
c2c5057
Add some comments about `_marker` fields.
nnethercote May 15, 2022
f5c9c12
Rename `b` as `buf` in several places.
nnethercote May 18, 2022
e6fa19a
Remove unnecessary blank line.
nnethercote May 16, 2022
41c10dd
Cut down `associated_item`.
nnethercote May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename ProcMacro trait as BangProcMacro. 
Similar to the existing `AttrProcMacro` trait.
  • Loading branch information
@nnethercote
nnethercote committed May 27, 2022
commit dbdc7dd0dcb7e7525fec145787d715d31d651a4b
6 changes: 3 additions & 3 deletions compiler/rustc_expand/src/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ where
}
}

pub trait ProcMacro {
pub trait BangProcMacro {
fn expand<'cx>(
&self,
ecx: &'cx mut ExtCtxt<'_>,
Expand All @@ -275,7 +275,7 @@ pub trait ProcMacro {
) -> Result<TokenStream, ErrorGuaranteed>;
}

impl<F> ProcMacro for F
impl<F> BangProcMacro for F
where
F: Fn(TokenStream) -> TokenStream,
{
Expand Down Expand Up @@ -640,7 +640,7 @@ pub enum SyntaxExtensionKind {
/// A token-based function-like macro.
Bang(
/// An expander with signature TokenStream -> TokenStream.
Box<dyn ProcMacro + sync::Sync + sync::Send>,
Box<dyn BangProcMacro + sync::Sync + sync::Send>,
),

/// An AST-based function-like macro.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_expand/src/proc_macro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub struct BangProcMacro {
pub client: pm::bridge::client::Client<fn(pm::TokenStream) -> pm::TokenStream>,
}

impl base::ProcMacro for BangProcMacro {
impl base::BangProcMacro for BangProcMacro {
fn expand<'cx>(
&self,
ecx: &'cx mut ExtCtxt<'_>,
Expand Down