Skip to content

Commit 8b0c292

Browse files
jseyfriedjseyfried
committed
Improve $crate.
1 parent 7b81106 commit 8b0c292

File tree

13 files changed

+47
-76
lines changed

13 files changed

+47
-76
lines changed

‎src/librustc_resolve/build_reduced_graph.rs

+17
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ use syntax::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind};
3737
use syntax::ast::{Mutability, StmtKind, TraitItem, TraitItemKind};
3838
use syntax::ast::{Variant, ViewPathGlob, ViewPathList, ViewPathSimple};
3939
use syntax::ext::base::{SyntaxExtension, Resolver as SyntaxResolver};
40+
use syntax::ext::expand::mark_tts;
4041
use syntax::ext::hygiene::Mark;
4142
use syntax::feature_gate::{self, emit_feature_err};
4243
use syntax::ext::tt::macro_rules;
@@ -207,11 +208,16 @@ impl<'b> Resolver<'b> {
207208
};
208209

209210
let mut custom_derive_crate = false;
211+
// The mark of the expansion that generates the loaded macros.
212+
let mut opt_mark = None;
210213
for loaded_macro in self.crate_loader.load_macros(item, is_crate_root) {
214+
let mark = opt_mark.unwrap_or_else(Mark::fresh);
215+
opt_mark = Some(mark);
211216
match loaded_macro.kind {
212217
LoadedMacroKind::Def(mut def) => {
213218
if def.use_locally {
214219
self.macro_names.insert(def.ident.name);
220+
def.body = mark_tts(&def.body, mark);
215221
let ext = macro_rules::compile(&self.session.parse_sess, &def);
216222
import_macro(self, def.ident.name, ext, loaded_macro.import_site);
217223
}
@@ -249,6 +255,17 @@ impl<'b> Resolver<'b> {
249255
});
250256
self.define(parent, name, TypeNS, (module, sp, vis));
251257

258+
if let Some(mark) = opt_mark {
259+
let invocation = self.arenas.alloc_invocation_data(InvocationData {
260+
module: Cell::new(module),
261+
def_index: CRATE_DEF_INDEX,
262+
const_integer: false,
263+
legacy_scope: Cell::new(LegacyScope::Empty),
264+
expansion: Cell::new(LegacyScope::Empty),
265+
});
266+
self.invocations.insert(mark, invocation);
267+
}
268+
252269
self.populate_module_if_necessary(module);
253270
} else if custom_derive_crate {
254271
// Define an empty module

‎src/librustc_resolve/lib.rs

+12-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use rustc::ty;
5353
use rustc::hir::{Freevar, FreevarMap, TraitCandidate, TraitMap, GlobMap};
5454
use rustc::util::nodemap::{NodeMap, NodeSet, FnvHashMap, FnvHashSet};
5555

56-
use syntax::ext::hygiene::Mark;
56+
use syntax::ext::hygiene::{Mark, SyntaxContext};
5757
use syntax::ast::{self, FloatTy};
5858
use syntax::ast::{CRATE_NODE_ID, Name, NodeId, Ident, IntTy, UintTy};
5959
use syntax::ext::base::SyntaxExtension;
@@ -1579,6 +1579,17 @@ impl<'a> Resolver<'a> {
15791579
/// grammar: (SELF MOD_SEP ) ? (SUPER MOD_SEP) *
15801580
fn resolve_module_prefix(&mut self, module_path: &[Ident], span: Option<Span>)
15811581
-> ResolveResult<ModulePrefixResult<'a>> {
1582+
if &*module_path[0].name.as_str() == "$crate" {
1583+
let mut ctxt = module_path[0].ctxt;
1584+
while ctxt.source().0 != SyntaxContext::empty() {
1585+
ctxt = ctxt.source().0;
1586+
}
1587+
let module = self.invocations[&ctxt.source().1].module.get();
1588+
let crate_root =
1589+
if module.def_id().unwrap().is_local() { self.graph_root } else { module };
1590+
return Success(PrefixFound(crate_root, 1))
1591+
}
1592+
15821593
// Start at the current module if we see `self` or `super`, or at the
15831594
// top of the crate otherwise.
15841595
let mut i = match &*module_path[0].name.as_str() {

‎src/librustc_resolve/macros.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ use syntax_pos::Span;
2929
#[derive(Clone)]
3030
pub struct InvocationData<'a> {
3131
pub module: Cell<Module<'a>>,
32-
def_index: DefIndex,
32+
pub def_index: DefIndex,
3333
// True if this expansion is in a `const_integer` position, for example `[u32; m!()]`.
3434
// c.f. `DefCollector::visit_ast_const_integer`.
35-
const_integer: bool,
35+
pub const_integer: bool,
3636
// The scope in which the invocation path is resolved.
3737
pub legacy_scope: Cell<LegacyScope<'a>>,
3838
// The smallest scope that includes this invocation's expansion,

‎src/librustdoc/html/highlight.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,9 @@ impl<'a> Classifier<'a> {
295295
"Option" | "Result" => Class::PreludeTy,
296296
"Some" | "None" | "Ok" | "Err" => Class::PreludeVal,
297297

298+
"$crate" => Class::KeyWord,
298299
_ if tas.tok.is_any_keyword() => Class::KeyWord,
300+
299301
_ => {
300302
if self.in_macro_nonterminal {
301303
self.in_macro_nonterminal = false;
@@ -310,9 +312,6 @@ impl<'a> Classifier<'a> {
310312
}
311313
}
312314

313-
// Special macro vars are like keywords.
314-
token::SpecialVarNt(_) => Class::KeyWord,
315-
316315
token::Lifetime(..) => Class::Lifetime,
317316

318317
token::Underscore | token::Eof | token::Interpolated(..) |

‎src/libsyntax/ext/expand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,6 @@ impl Folder for Marker {
939939
}
940940

941941
// apply a given mark to the given token trees. Used prior to expansion of a macro.
942-
fn mark_tts(tts: &[TokenTree], m: Mark) -> Vec<TokenTree> {
942+
pub fn mark_tts(tts: &[TokenTree], m: Mark) -> Vec<TokenTree> {
943943
noop_fold_tts(tts, &mut Marker{mark:m, expn_id: None})
944944
}

‎src/libsyntax/ext/tt/macro_rules.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ impl<'a> ParserAnyMacro<'a> {
5858

5959
struct MacroRulesMacroExpander {
6060
name: ast::Ident,
61-
imported_from: Option<ast::Ident>,
6261
lhses: Vec<TokenTree>,
6362
rhses: Vec<TokenTree>,
6463
valid: bool,
@@ -76,7 +75,6 @@ impl TTMacroExpander for MacroRulesMacroExpander {
7675
generic_extension(cx,
7776
sp,
7877
self.name,
79-
self.imported_from,
8078
arg,
8179
&self.lhses,
8280
&self.rhses)
@@ -87,7 +85,6 @@ impl TTMacroExpander for MacroRulesMacroExpander {
8785
fn generic_extension<'cx>(cx: &'cx ExtCtxt,
8886
sp: Span,
8987
name: ast::Ident,
90-
imported_from: Option<ast::Ident>,
9188
arg: &[TokenTree],
9289
lhses: &[TokenTree],
9390
rhses: &[TokenTree])
@@ -116,10 +113,8 @@ fn generic_extension<'cx>(cx: &'cx ExtCtxt,
116113
_ => cx.span_bug(sp, "malformed macro rhs"),
117114
};
118115
// rhs has holes ( `$id` and `$(...)` that need filled)
119-
let trncbr = new_tt_reader(&cx.parse_sess.span_diagnostic,
120-
Some(named_matches),
121-
imported_from,
122-
rhs);
116+
let trncbr =
117+
new_tt_reader(&cx.parse_sess.span_diagnostic, Some(named_matches), rhs);
123118
let mut p = Parser::new(cx.parse_sess(), cx.cfg().clone(), Box::new(trncbr));
124119
p.directory = cx.current_expansion.module.directory.clone();
125120
p.restrictions = match cx.current_expansion.no_noninline_mod {
@@ -223,7 +218,7 @@ pub fn compile(sess: &ParseSess, def: &ast::MacroDef) -> SyntaxExtension {
223218
];
224219

225220
// Parse the macro_rules! invocation (`none` is for no interpolations):
226-
let arg_reader = new_tt_reader(&sess.span_diagnostic, None, None, def.body.clone());
221+
let arg_reader = new_tt_reader(&sess.span_diagnostic, None, def.body.clone());
227222

228223
let argument_map = match parse(sess, &Vec::new(), arg_reader, &argument_gram) {
229224
Success(m) => m,
@@ -269,7 +264,6 @@ pub fn compile(sess: &ParseSess, def: &ast::MacroDef) -> SyntaxExtension {
269264

270265
let exp: Box<_> = Box::new(MacroRulesMacroExpander {
271266
name: def.ident,
272-
imported_from: def.imported_from,
273267
lhses: lhses,
274268
rhses: rhses,
275269
valid: valid,

‎src/libsyntax/ext/tt/transcribe.rs

+2-29
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use syntax_pos::{Span, DUMMY_SP};
1414
use errors::{Handler, DiagnosticBuilder};
1515
use ext::tt::macro_parser::{NamedMatch, MatchedSeq, MatchedNonterminal};
1616
use parse::token::{DocComment, MatchNt, SubstNt};
17-
use parse::token::{Token, Interpolated, NtIdent, NtTT, SpecialMacroVar};
17+
use parse::token::{Token, Interpolated, NtIdent, NtTT};
1818
use parse::token;
1919
use parse::lexer::TokenAndSpan;
2020
use tokenstream::{self, TokenTree};
@@ -39,10 +39,7 @@ pub struct TtReader<'a> {
3939
stack: Vec<TtFrame>,
4040
/* for MBE-style macro transcription */
4141
interpolations: HashMap<Ident, Rc<NamedMatch>>,
42-
imported_from: Option<Ident>,
4342

44-
// Some => return imported_from as the next token
45-
crate_name_next: Option<Span>,
4643
repeat_idx: Vec<usize>,
4744
repeat_len: Vec<usize>,
4845
/* cached: */
@@ -59,10 +56,9 @@ pub struct TtReader<'a> {
5956
/// (and should) be None.
6057
pub fn new_tt_reader(sp_diag: &Handler,
6158
interp: Option<HashMap<Ident, Rc<NamedMatch>>>,
62-
imported_from: Option<Ident>,
6359
src: Vec<tokenstream::TokenTree>)
6460
-> TtReader {
65-
new_tt_reader_with_doc_flag(sp_diag, interp, imported_from, src, false)
61+
new_tt_reader_with_doc_flag(sp_diag, interp, src, false)
6662
}
6763

6864
/// The extra `desugar_doc_comments` flag enables reading doc comments
@@ -73,7 +69,6 @@ pub fn new_tt_reader(sp_diag: &Handler,
7369
/// (and should) be None.
7470
pub fn new_tt_reader_with_doc_flag(sp_diag: &Handler,
7571
interp: Option<HashMap<Ident, Rc<NamedMatch>>>,
76-
imported_from: Option<Ident>,
7772
src: Vec<tokenstream::TokenTree>,
7873
desugar_doc_comments: bool)
7974
-> TtReader {
@@ -93,8 +88,6 @@ pub fn new_tt_reader_with_doc_flag(sp_diag: &Handler,
9388
None => HashMap::new(),
9489
Some(x) => x,
9590
},
96-
imported_from: imported_from,
97-
crate_name_next: None,
9891
repeat_idx: Vec::new(),
9992
repeat_len: Vec::new(),
10093
desugar_doc_comments: desugar_doc_comments,
@@ -189,14 +182,6 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
189182
sp: r.cur_span.clone(),
190183
};
191184
loop {
192-
match r.crate_name_next.take() {
193-
None => (),
194-
Some(sp) => {
195-
r.cur_span = sp;
196-
r.cur_tok = token::Ident(r.imported_from.unwrap());
197-
return ret_val;
198-
},
199-
}
200185
let should_pop = match r.stack.last() {
201186
None => {
202187
assert_eq!(ret_val.tok, token::Eof);
@@ -346,18 +331,6 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
346331
sep: None
347332
});
348333
}
349-
TokenTree::Token(sp, token::SpecialVarNt(SpecialMacroVar::CrateMacroVar)) => {
350-
r.stack.last_mut().unwrap().idx += 1;
351-
352-
if r.imported_from.is_some() {
353-
r.cur_span = sp;
354-
r.cur_tok = token::ModSep;
355-
r.crate_name_next = Some(sp);
356-
return ret_val;
357-
}
358-
359-
// otherwise emit nothing and proceed to the next token
360-
}
361334
TokenTree::Token(sp, tok) => {
362335
r.cur_span = sp;
363336
r.cur_tok = tok;

‎src/libsyntax/parse/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ pub fn filemap_to_tts(sess: &ParseSess, filemap: Rc<FileMap>)
276276
pub fn tts_to_parser<'a>(sess: &'a ParseSess,
277277
tts: Vec<tokenstream::TokenTree>,
278278
cfg: ast::CrateConfig) -> Parser<'a> {
279-
let trdr = lexer::new_tt_reader(&sess.span_diagnostic, None, None, tts);
279+
let trdr = lexer::new_tt_reader(&sess.span_diagnostic, None, tts);
280280
let mut p = Parser::new(sess, cfg, Box::new(trdr));
281281
p.check_unknown_macro_variable();
282282
p

‎src/libsyntax/parse/parser.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ use parse::classify;
4848
use parse::common::SeqSep;
4949
use parse::lexer::{Reader, TokenAndSpan};
5050
use parse::obsolete::ObsoleteSyntax;
51-
use parse::token::{self, intern, MatchNt, SubstNt, SpecialVarNt, InternedString};
52-
use parse::token::{keywords, SpecialMacroVar};
51+
use parse::token::{self, intern, keywords, MatchNt, SubstNt, InternedString};
5352
use parse::{new_sub_parser_from_file, ParseSess};
5453
use util::parser::{AssocOp, Fixity};
5554
use print::pprust;
@@ -2653,8 +2652,12 @@ impl<'a> Parser<'a> {
26532652
num_captures: name_num
26542653
})));
26552654
} else if self.token.is_keyword(keywords::Crate) {
2655+
let ident = match self.token {
2656+
token::Ident(id) => ast::Ident { name: token::intern("$crate"), ..id },
2657+
_ => unreachable!(),
2658+
};
26562659
self.bump();
2657-
return Ok(TokenTree::Token(sp, SpecialVarNt(SpecialMacroVar::CrateMacroVar)));
2660+
return Ok(TokenTree::Token(sp, token::Ident(ident)));
26582661
} else {
26592662
sp = mk_sp(sp.lo, self.span.hi);
26602663
self.parse_ident().unwrap_or_else(|mut e| {

‎src/libsyntax/parse/token.rs

-17
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,6 @@ pub enum DelimToken {
5252
NoDelim,
5353
}
5454

55-
#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Eq, Hash, Debug, Copy)]
56-
pub enum SpecialMacroVar {
57-
/// `$crate` will be filled in with the name of the crate a macro was
58-
/// imported from, if any.
59-
CrateMacroVar,
60-
}
61-
62-
impl SpecialMacroVar {
63-
pub fn as_str(self) -> &'static str {
64-
match self {
65-
SpecialMacroVar::CrateMacroVar => "crate",
66-
}
67-
}
68-
}
69-
7055
#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Eq, Hash, Debug, Copy)]
7156
pub enum Lit {
7257
Byte(ast::Name),
@@ -148,8 +133,6 @@ pub enum Token {
148133
// In right-hand-sides of MBE macros:
149134
/// A syntactic variable that will be filled in by macro expansion.
150135
SubstNt(ast::Ident),
151-
/// A macro variable with special meaning.
152-
SpecialVarNt(SpecialMacroVar),
153136

154137
// Junk. These carry no data because we don't really care about the data
155138
// they *would* carry, and don't really want to allocate a new ident for

‎src/libsyntax/print/pprust.rs

-2
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,6 @@ pub fn token_to_string(tok: &Token) -> String {
285285
token::Comment => "/* */".to_string(),
286286
token::Shebang(s) => format!("/* shebang: {}*/", s),
287287

288-
token::SpecialVarNt(var) => format!("${}", var.as_str()),
289-
290288
token::Interpolated(ref nt) => match *nt {
291289
token::NtExpr(ref e) => expr_to_string(&e),
292290
token::NtMeta(ref e) => meta_item_to_string(&e),

‎src/libsyntax/tokenstream.rs

-7
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ impl TokenTree {
134134
AttrStyle::Inner => 3,
135135
}
136136
}
137-
TokenTree::Token(_, token::SpecialVarNt(..)) => 2,
138137
TokenTree::Token(_, token::MatchNt(..)) => 3,
139138
TokenTree::Token(_, token::Interpolated(Nonterminal::NtTT(..))) => 1,
140139
TokenTree::Delimited(_, ref delimed) => delimed.tts.len() + 2,
@@ -188,11 +187,6 @@ impl TokenTree {
188187
}
189188
delimed.tts[index - 1].clone()
190189
}
191-
(&TokenTree::Token(sp, token::SpecialVarNt(var)), _) => {
192-
let v = [TokenTree::Token(sp, token::Dollar),
193-
TokenTree::Token(sp, token::Ident(token::str_to_ident(var.as_str())))];
194-
v[index].clone()
195-
}
196190
(&TokenTree::Token(sp, token::MatchNt(name, kind)), _) => {
197191
let v = [TokenTree::Token(sp, token::SubstNt(name)),
198192
TokenTree::Token(sp, token::Colon),
@@ -223,7 +217,6 @@ impl TokenTree {
223217
-> macro_parser::NamedParseResult {
224218
// `None` is because we're not interpolating
225219
let arg_rdr = lexer::new_tt_reader_with_doc_flag(&cx.parse_sess().span_diagnostic,
226-
None,
227220
None,
228221
tts.iter().cloned().collect(),
229222
true);

‎src/test/pretty/issue-4264.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939

4040

41-
((::std::fmt::format as
41+
(($crate::fmt::format as
4242
fn(std::fmt::Arguments<'_>) -> std::string::String {std::fmt::format})(((::std::fmt::Arguments::new_v1
4343
as
4444
fn(&[&str], &[std::fmt::ArgumentV1<'_>]) -> std::fmt::Arguments<'_> {std::fmt::Arguments<'_>::new_v1})(({

0 commit comments

Comments
 (0)