Skip to content

Commit 28a8452

Browse files
committed
Remove unused argument in Mark::fresh
1 parent 63a5bbd commit 28a8452

File tree

10 files changed

+11
-14
lines changed

10 files changed

+11
-14
lines changed

src/libproc_macro/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl FromStr for TokenStream {
123123
let expn_info = mark.expn_info().unwrap();
124124
let call_site = expn_info.call_site;
125125
// notify the expansion info that it is unhygienic
126-
let mark = Mark::fresh(mark);
126+
let mark = Mark::fresh();
127127
mark.set_expn_info(expn_info);
128128
let span = call_site.with_ctxt(SyntaxContext::empty().apply_mark(mark));
129129
let stream = parse::parse_stream_from_source_str(name, src, sess, Some(span));

src/librustc/hir/lowering.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ impl<'a> LoweringContext<'a> {
580580
}
581581

582582
fn allow_internal_unstable(&self, reason: CompilerDesugaringKind, span: Span) -> Span {
583-
let mark = Mark::fresh(Mark::root());
583+
let mark = Mark::fresh();
584584
mark.set_expn_info(codemap::ExpnInfo {
585585
call_site: span,
586586
callee: codemap::NameAndSpan {

src/librustc_allocator/expand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl<'a> Folder for ExpandAllocatorDirectives<'a> {
7878
}
7979
self.found = true;
8080

81-
let mark = Mark::fresh(Mark::root());
81+
let mark = Mark::fresh();
8282
mark.set_expn_info(ExpnInfo {
8383
call_site: DUMMY_SP,
8484
callee: NameAndSpan {

src/librustc_resolve/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl<'a> base::Resolver for Resolver<'a> {
123123
}
124124

125125
fn get_module_scope(&mut self, id: ast::NodeId) -> Mark {
126-
let mark = Mark::fresh(Mark::root());
126+
let mark = Mark::fresh();
127127
let module = self.module_map[&self.definitions.local_def_id(id)];
128128
self.invocations.insert(mark, self.arenas.alloc_invocation_data(InvocationData {
129129
module: Cell::new(module),

src/libsyntax/ext/expand.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
347347
let derives = derives.entry(invoc.expansion_data.mark).or_insert_with(Vec::new);
348348

349349
for path in &traits {
350-
let mark = Mark::fresh(self.cx.current_expansion.mark);
350+
let mark = Mark::fresh();
351351
derives.push(mark);
352352
let item = match self.cx.resolver.resolve_macro(
353353
Mark::root(), path, MacroKind::Derive, false) {
@@ -999,7 +999,7 @@ struct InvocationCollector<'a, 'b: 'a> {
999999

10001000
impl<'a, 'b> InvocationCollector<'a, 'b> {
10011001
fn collect(&mut self, expansion_kind: ExpansionKind, kind: InvocationKind) -> Expansion {
1002-
let mark = Mark::fresh(self.cx.current_expansion.mark);
1002+
let mark = Mark::fresh();
10031003
self.invocations.push(Invocation {
10041004
kind,
10051005
expansion_kind,

src/libsyntax/std_inject.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use tokenstream::TokenStream;
2222
/// call to codemap's `is_internal` check.
2323
/// The expanded code uses the unstable `#[prelude_import]` attribute.
2424
fn ignored_span(sp: Span) -> Span {
25-
let mark = Mark::fresh(Mark::root());
25+
let mark = Mark::fresh();
2626
mark.set_expn_info(ExpnInfo {
2727
call_site: DUMMY_SP,
2828
callee: NameAndSpan {

src/libsyntax/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ fn generate_test_harness(sess: &ParseSess,
275275
let mut cleaner = EntryPointCleaner { depth: 0 };
276276
let krate = cleaner.fold_crate(krate);
277277

278-
let mark = Mark::fresh(Mark::root());
278+
let mark = Mark::fresh();
279279

280280
let mut econfig = ExpansionConfig::default("test".to_string());
281281
econfig.features = Some(features);

src/libsyntax_ext/deriving/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ fn call_intrinsic(cx: &ExtCtxt,
159159
} else { // Avoid instability errors with user defined curstom derives, cc #36316
160160
let mut info = cx.current_expansion.mark.expn_info().unwrap();
161161
info.callee.allow_internal_unstable = true;
162-
let mark = Mark::fresh(Mark::root());
162+
let mark = Mark::fresh();
163163
mark.set_expn_info(info);
164164
span = span.with_ctxt(SyntaxContext::empty().apply_mark(mark));
165165
}

src/libsyntax_ext/proc_macro_registrar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ fn mk_registrar(cx: &mut ExtCtxt,
361361
custom_derives: &[ProcMacroDerive],
362362
custom_attrs: &[ProcMacroDef],
363363
custom_macros: &[ProcMacroDef]) -> P<ast::Item> {
364-
let mark = Mark::fresh(Mark::root());
364+
let mark = Mark::fresh();
365365
mark.set_expn_info(ExpnInfo {
366366
call_site: DUMMY_SP,
367367
callee: NameAndSpan {

src/libsyntax_pos/hygiene.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub enum MarkKind {
5353
}
5454

5555
impl Mark {
56-
pub fn fresh(_parent: Mark) -> Self {
56+
pub fn fresh() -> Self {
5757
HygieneData::with(|data| {
5858
data.marks.push(MarkData { kind: MarkKind::Legacy, expn_info: None });
5959
Mark(data.marks.len() as u32 - 1)
@@ -92,7 +92,6 @@ impl Mark {
9292
if self == Mark::root() || data.marks[self.0 as usize].kind == MarkKind::Modern {
9393
return self;
9494
}
95-
9695
self = self.call_site_mark(data);
9796
}
9897
})
@@ -114,7 +113,6 @@ impl Mark {
114113
if self == Mark::root() {
115114
return false;
116115
}
117-
118116
self = self.call_site_mark(data);
119117
}
120118
true
@@ -135,7 +133,6 @@ impl Mark {
135133
let mut a_path = FxHashSet::<Mark>();
136134
while a != Mark::root() {
137135
a_path.insert(a);
138-
139136
a = a.call_site_mark(data);
140137
}
141138

0 commit comments

Comments
 (0)