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
This commit is contained in:
Dylan DPC
2019-12-29 13:09:56 +05:30
committed by GitHub
2 changed files with 6 additions and 3 deletions
+4 -2
View File
@@ -412,7 +412,8 @@ pub fn expand_ext(
_ => {
// Non-ADT derive is an error, but it should have been
// set earlier; see
// libsyntax/ext/expand.rs:MacroExpander::expand()
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
return;
}
};
@@ -486,7 +487,8 @@ pub fn expand_ext(
_ => {
// Non-Item derive is an error, but it should have been
// set earlier; see
// libsyntax/ext/expand.rs:MacroExpander::expand()
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
return;
}
}
+2 -1
View File
@@ -92,7 +92,8 @@ fn inject_impl_of_structural_trait(
_ => {
// Non-Item derive is an error, but it should have been
// set earlier; see
// libsyntax/ext/expand.rs:MacroExpander::expand()
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
return;
}
};