Skip to content

Commit 64c0969

Browse files
borsbors
committed
Auto merge of rust-lang#64570 - tmandry:rollup-3pg02lj, r=tmandry
Rollup of 4 pull requests Successful merges: - rust-lang#64486 (Print out more information for `-Zunpretty=expanded,hygiene`) - rust-lang#64503 (rename Allocation::retag -> with_tags_and_extra) - rust-lang#64516 (update Nomicon and Reference) - rust-lang#64528 (Load proc macro metadata in the correct order.) Failed merges: r? @ghost
2 parents 5283791 + 76d34f3 commit 64c0969

File tree

13 files changed

+143
-60
lines changed

13 files changed

+143
-60
lines changed

‎src/doc/nomicon

‎src/doc/reference

‎src/librustc/mir/interpret/allocation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ impl<Tag> Allocation<Tag> {
130130
}
131131
}
132132

133-
impl Allocation<()> {
133+
impl Allocation<(), ()> {
134134
/// Add Tag and Extra fields
135-
pub fn retag<T, E>(
135+
pub fn with_tags_and_extra<T, E>(
136136
self,
137137
mut tagger: impl FnMut(AllocId) -> T,
138138
extra: E,

‎src/librustc_driver/pretty.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ impl<'hir> pprust::PpAnn for IdentifiedAnnotation<'hir> {
326326
}
327327
fn post(&self, s: &mut pprust::State<'_>, node: pprust::AnnNode<'_>) {
328328
match node {
329+
pprust::AnnNode::Crate(_) |
329330
pprust::AnnNode::Ident(_) |
330331
pprust::AnnNode::Name(_) => {},
331332

@@ -431,14 +432,18 @@ impl<'a> pprust::PpAnn for HygieneAnnotation<'a> {
431432
match node {
432433
pprust::AnnNode::Ident(&ast::Ident { name, span }) => {
433434
s.s.space();
434-
// FIXME #16420: this doesn't display the connections
435-
// between syntax contexts
436435
s.synth_comment(format!("{}{:?}", name.as_u32(), span.ctxt()))
437436
}
438437
pprust::AnnNode::Name(&name) => {
439438
s.s.space();
440439
s.synth_comment(name.as_u32().to_string())
441440
}
441+
pprust::AnnNode::Crate(_) => {
442+
s.s.hardbreak();
443+
let verbose = self.sess.verbose();
444+
s.synth_comment(syntax_pos::hygiene::debug_hygiene_data(verbose));
445+
s.s.hardbreak_if_not_bol();
446+
}
442447
_ => {}
443448
}
444449
}

‎src/librustc_metadata/decoder.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,11 @@ impl<'a, 'tcx> CrateMetadata {
489489

490490
fn raw_proc_macro(&self, id: DefIndex) -> &ProcMacro {
491491
// DefIndex's in root.proc_macro_data have a one-to-one correspondence
492-
// with items in 'raw_proc_macros'
492+
// with items in 'raw_proc_macros'.
493+
// NOTE: If you update the order of macros in 'proc_macro_data' for any reason,
494+
// you must also update src/libsyntax_ext/proc_macro_harness.rs
495+
// Failing to do so will result in incorrect data being associated
496+
// with proc macros when deserialized.
493497
let pos = self.root.proc_macro_data.unwrap().decode(self).position(|i| i == id).unwrap();
494498
&self.raw_proc_macros.unwrap()[pos]
495499
}

‎src/libsyntax/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2387,7 +2387,7 @@ pub enum ItemKind {
23872387
),
23882388
/// A macro invocation.
23892389
///
2390-
/// E.g., `macro_rules! foo { .. }` or `foo!(..)`.
2390+
/// E.g., `foo!(..)`.
23912391
Mac(Mac),
23922392

23932393
/// A macro definition.

‎src/libsyntax/print/pprust.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pub enum AnnNode<'a> {
3535
SubItem(ast::NodeId),
3636
Expr(&'a ast::Expr),
3737
Pat(&'a ast::Pat),
38+
Crate(&'a ast::Crate),
3839
}
3940

4041
pub trait PpAnn {
@@ -140,6 +141,7 @@ pub fn print_crate<'a>(cm: &'a SourceMap,
140141

141142
s.print_mod(&krate.module, &krate.attrs);
142143
s.print_remaining_comments();
144+
s.ann.post(&mut s, AnnNode::Crate(krate));
143145
s.s.eof()
144146
}
145147

@@ -1369,8 +1371,12 @@ impl<'a> State<'a> {
13691371
}
13701372
}
13711373
ast::ItemKind::MacroDef(ref macro_def) => {
1372-
let (kw, has_bang) =
1373-
if macro_def.legacy { ("macro_rules", true) } else { ("macro", false) };
1374+
let (kw, has_bang) = if macro_def.legacy {
1375+
("macro_rules", true)
1376+
} else {
1377+
self.print_visibility(&item.vis);
1378+
("macro", false)
1379+
};
13741380
self.print_mac_common(
13751381
Some(MacHeader::Keyword(kw)),
13761382
has_bang,

‎src/libsyntax_ext/proc_macro_harness.rs

Lines changed: 62 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,24 @@ struct ProcMacroDerive {
2020
attrs: Vec<ast::Name>,
2121
}
2222

23+
enum ProcMacroDefType {
24+
Attr,
25+
Bang
26+
}
27+
2328
struct ProcMacroDef {
2429
function_name: Ident,
2530
span: Span,
31+
def_type: ProcMacroDefType
32+
}
33+
34+
enum ProcMacro {
35+
Derive(ProcMacroDerive),
36+
Def(ProcMacroDef)
2637
}
2738

2839
struct CollectProcMacros<'a> {
29-
derives: Vec<ProcMacroDerive>,
30-
attr_macros: Vec<ProcMacroDef>,
31-
bang_macros: Vec<ProcMacroDef>,
40+
macros: Vec<ProcMacro>,
3241
in_root: bool,
3342
handler: &'a errors::Handler,
3443
is_proc_macro_crate: bool,
@@ -46,22 +55,22 @@ pub fn inject(sess: &ParseSess,
4655
let ecfg = ExpansionConfig::default("proc_macro".to_string());
4756
let mut cx = ExtCtxt::new(sess, ecfg, resolver);
4857

49-
let (derives, attr_macros, bang_macros) = {
50-
let mut collect = CollectProcMacros {
51-
derives: Vec::new(),
52-
attr_macros: Vec::new(),
53-
bang_macros: Vec::new(),
54-
in_root: true,
55-
handler,
56-
is_proc_macro_crate,
57-
is_test_crate,
58-
};
59-
if has_proc_macro_decls || is_proc_macro_crate {
60-
visit::walk_crate(&mut collect, &krate);
61-
}
62-
(collect.derives, collect.attr_macros, collect.bang_macros)
58+
let mut collect = CollectProcMacros {
59+
macros: Vec::new(),
60+
in_root: true,
61+
handler,
62+
is_proc_macro_crate,
63+
is_test_crate,
6364
};
6465

66+
if has_proc_macro_decls || is_proc_macro_crate {
67+
visit::walk_crate(&mut collect, &krate);
68+
}
69+
// NOTE: If you change the order of macros in this vec
70+
// for any reason, you must also update 'raw_proc_macro'
71+
// in src/librustc_metadata/decoder.rs
72+
let macros = collect.macros;
73+
6574
if !is_proc_macro_crate {
6675
return krate
6776
}
@@ -74,7 +83,7 @@ pub fn inject(sess: &ParseSess,
7483
return krate;
7584
}
7685

77-
krate.module.items.push(mk_decls(&mut cx, &derives, &attr_macros, &bang_macros));
86+
krate.module.items.push(mk_decls(&mut cx, &macros));
7887

7988
krate
8089
}
@@ -161,12 +170,12 @@ impl<'a> CollectProcMacros<'a> {
161170
};
162171

163172
if self.in_root && item.vis.node.is_pub() {
164-
self.derives.push(ProcMacroDerive {
173+
self.macros.push(ProcMacro::Derive(ProcMacroDerive {
165174
span: item.span,
166175
trait_name: trait_ident.name,
167176
function_name: item.ident,
168177
attrs: proc_attrs,
169-
});
178+
}));
170179
} else {
171180
let msg = if !self.in_root {
172181
"functions tagged with `#[proc_macro_derive]` must \
@@ -180,10 +189,11 @@ impl<'a> CollectProcMacros<'a> {
180189

181190
fn collect_attr_proc_macro(&mut self, item: &'a ast::Item) {
182191
if self.in_root && item.vis.node.is_pub() {
183-
self.attr_macros.push(ProcMacroDef {
192+
self.macros.push(ProcMacro::Def(ProcMacroDef {
184193
span: item.span,
185194
function_name: item.ident,
186-
});
195+
def_type: ProcMacroDefType::Attr
196+
}));
187197
} else {
188198
let msg = if !self.in_root {
189199
"functions tagged with `#[proc_macro_attribute]` must \
@@ -197,10 +207,11 @@ impl<'a> CollectProcMacros<'a> {
197207

198208
fn collect_bang_proc_macro(&mut self, item: &'a ast::Item) {
199209
if self.in_root && item.vis.node.is_pub() {
200-
self.bang_macros.push(ProcMacroDef {
210+
self.macros.push(ProcMacro::Def(ProcMacroDef {
201211
span: item.span,
202212
function_name: item.ident,
203-
});
213+
def_type: ProcMacroDefType::Bang
214+
}));
204215
} else {
205216
let msg = if !self.in_root {
206217
"functions tagged with `#[proc_macro]` must \
@@ -322,9 +333,7 @@ impl<'a> Visitor<'a> for CollectProcMacros<'a> {
322333
// }
323334
fn mk_decls(
324335
cx: &mut ExtCtxt<'_>,
325-
custom_derives: &[ProcMacroDerive],
326-
custom_attrs: &[ProcMacroDef],
327-
custom_macros: &[ProcMacroDef],
336+
macros: &[ProcMacro],
328337
) -> P<ast::Item> {
329338
let expn_id = cx.resolver.expansion_for_ast_pass(
330339
DUMMY_SP,
@@ -354,26 +363,32 @@ fn mk_decls(
354363
let proc_macro_ty_method_path = |method| cx.expr_path(cx.path(span, vec![
355364
proc_macro, bridge, client, proc_macro_ty, method,
356365
]));
357-
custom_derives.iter().map(|cd| {
358-
cx.expr_call(span, proc_macro_ty_method_path(custom_derive), vec![
359-
cx.expr_str(cd.span, cd.trait_name),
360-
cx.expr_vec_slice(
361-
span,
362-
cd.attrs.iter().map(|&s| cx.expr_str(cd.span, s)).collect::<Vec<_>>()
363-
),
364-
local_path(cd.span, cd.function_name),
365-
])
366-
}).chain(custom_attrs.iter().map(|ca| {
367-
cx.expr_call(span, proc_macro_ty_method_path(attr), vec![
368-
cx.expr_str(ca.span, ca.function_name.name),
369-
local_path(ca.span, ca.function_name),
370-
])
371-
})).chain(custom_macros.iter().map(|cm| {
372-
cx.expr_call(span, proc_macro_ty_method_path(bang), vec![
373-
cx.expr_str(cm.span, cm.function_name.name),
374-
local_path(cm.span, cm.function_name),
375-
])
376-
})).collect()
366+
macros.iter().map(|m| {
367+
match m {
368+
ProcMacro::Derive(cd) => {
369+
cx.expr_call(span, proc_macro_ty_method_path(custom_derive), vec![
370+
cx.expr_str(cd.span, cd.trait_name),
371+
cx.expr_vec_slice(
372+
span,
373+
cd.attrs.iter().map(|&s| cx.expr_str(cd.span, s)).collect::<Vec<_>>()
374+
),
375+
local_path(cd.span, cd.function_name),
376+
])
377+
},
378+
ProcMacro::Def(ca) => {
379+
let ident = match ca.def_type {
380+
ProcMacroDefType::Attr => attr,
381+
ProcMacroDefType::Bang => bang
382+
};
383+
384+
cx.expr_call(span, proc_macro_ty_method_path(ident), vec![
385+
cx.expr_str(ca.span, ca.function_name.name),
386+
local_path(ca.span, ca.function_name),
387+
])
388+
389+
}
390+
}
391+
}).collect()
377392
};
378393

379394
let decls_static = cx.item_static(

‎src/libsyntax_pos/hygiene.rs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,38 @@ pub fn update_dollar_crate_names(mut get_name: impl FnMut(SyntaxContext) -> Symb
343343
}))
344344
}
345345

346+
pub fn debug_hygiene_data(verbose: bool) -> String {
347+
HygieneData::with(|data| {
348+
if verbose {
349+
format!("{:#?}", data)
350+
} else {
351+
let mut s = String::from("");
352+
s.push_str("Expansions:");
353+
data.expn_data.iter().enumerate().for_each(|(id, expn_info)| {
354+
let expn_info = expn_info.as_ref().expect("no expansion data for an expansion ID");
355+
s.push_str(&format!(
356+
"\n{}: parent: {:?}, call_site_ctxt: {:?}, kind: {:?}",
357+
id,
358+
expn_info.parent,
359+
expn_info.call_site.ctxt(),
360+
expn_info.kind,
361+
));
362+
});
363+
s.push_str("\n\nSyntaxContexts:");
364+
data.syntax_context_data.iter().enumerate().for_each(|(id, ctxt)| {
365+
s.push_str(&format!(
366+
"\n#{}: parent: {:?}, outer_mark: ({:?}, {:?})",
367+
id,
368+
ctxt.parent,
369+
ctxt.outer_expn,
370+
ctxt.outer_transparency,
371+
));
372+
});
373+
s
374+
}
375+
})
376+
}
377+
346378
impl SyntaxContext {
347379
#[inline]
348380
pub const fn root() -> Self {

‎src/test/pretty/macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
#![feature(decl_macro)]
44

5-
macro mac { ($ arg : expr) => { $ arg + $ arg } }
5+
pub(crate) macro mac { ($ arg : expr) => { $ arg + $ arg } }
66

77
fn main() { }

‎src/test/rustdoc/inline_cross/proc_macro.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,19 @@ extern crate some_macros;
1010
// @has proc_macro/macro.some_proc_macro.html
1111
// @has proc_macro/attr.some_proc_attr.html
1212
// @has proc_macro/derive.SomeDerive.html
13-
pub use some_macros::{some_proc_macro, some_proc_attr, SomeDerive};
13+
14+
// @has proc_macro/macro.some_proc_macro.html
15+
// @has - 'a proc-macro that swallows its input and does nothing.'
16+
pub use some_macros::some_proc_macro;
1417

1518
// @has proc_macro/macro.reexported_macro.html
1619
// @has - 'Doc comment from the original crate'
1720
pub use some_macros::reexported_macro;
21+
22+
// @has proc_macro/attr.some_proc_attr.html
23+
// @has - 'a proc-macro attribute that passes its item through verbatim.'
24+
pub use some_macros::some_proc_attr;
25+
26+
// @has proc_macro/derive.SomeDerive.html
27+
// @has - 'a derive attribute that adds nothing to its input.'
28+
pub use some_macros::SomeDerive;

‎src/test/ui/hygiene/unpretty-debug.stdout

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,13 @@ macro_rules! foo /* 0#0 */ { ($ x : ident) => { y + $ x } }
1313
fn bar /* 0#0 */() { let x /* 0#0 */ = 1; y /* 0#1 */ + x /* 0#0 */ }
1414

1515
fn y /* 0#0 */() { }
16+
17+
/*
18+
Expansions:
19+
0: parent: ExpnId(0), call_site_ctxt: #0, kind: Root
20+
1: parent: ExpnId(0), call_site_ctxt: #0, kind: Macro(Bang, foo)
21+
22+
SyntaxContexts:
23+
#0: parent: #0, outer_mark: (ExpnId(0), Opaque)
24+
#1: parent: #0, outer_mark: (ExpnId(1), SemiTransparent)
25+
*/

‎src/tools/miri

Submodule miri updated 1 file

0 commit comments

Comments
 (0)