Skip to content

Commit 115e3c8

Browse files
authored
Rollup merge of #67482 - ldm0:master, r=petrochenkov
Fix outdated comment Logics in `libsyntax/ext/expand.rs:MacroExpander::expand()` have been moved to `libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()` This pull request fixs the dangling file path. #### Old https://github.com/rust-lang/rust/blob/35176867f62f76b9bc27267878f2d74d9c776221/src/libsyntax/ext/expand.rs#L285-L301 #### New https://github.com/rust-lang/rust/blob/9ff30a7810c586819a78188c173a7b74adbb9730/src/libsyntax_expand/expand.rs#L421-L439 https://github.com/rust-lang/rust/blob/9ff30a7810c586819a78188c173a7b74adbb9730/src/libsyntax_expand/base.rs#L224-L234
2 parents 774a4bd + decb959 commit 115e3c8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/libsyntax_ext/deriving/generic/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,8 @@ impl<'a> TraitDef<'a> {
412412
_ => {
413413
// Non-ADT derive is an error, but it should have been
414414
// set earlier; see
415-
// libsyntax/ext/expand.rs:MacroExpander::expand()
415+
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
416+
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
416417
return;
417418
}
418419
};
@@ -486,7 +487,8 @@ impl<'a> TraitDef<'a> {
486487
_ => {
487488
// Non-Item derive is an error, but it should have been
488489
// set earlier; see
489-
// libsyntax/ext/expand.rs:MacroExpander::expand()
490+
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
491+
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
490492
return;
491493
}
492494
}

src/libsyntax_ext/deriving/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ fn inject_impl_of_structural_trait(
9292
_ => {
9393
// Non-Item derive is an error, but it should have been
9494
// set earlier; see
95-
// libsyntax/ext/expand.rs:MacroExpander::expand()
95+
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
96+
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
9697
return;
9798
}
9899
};

0 commit comments

Comments
 (0)