user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #67482 - ldm0:master, r=petrochenkov

Browse source 
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

35176867f6/src/libsyntax/ext/expand.rs (L285-L301)

#### New

9ff30a7810/src/libsyntax_expand/expand.rs (L421-L439)

9ff30a7810/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
commit 115e3c80df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax_ext/deriving/generic/mod.rs
View file

@ -412,7 +412,8 @@ impl<'a> TraitDef<'a> {
_ => {
// 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 @@ impl<'a> TraitDef<'a> {
_ => {
// 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;
}
}

3
src/libsyntax_ext/deriving/mod.rs
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;
}
};