diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2019-12-29 13:09:56 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-29 13:09:56 +0530 |
| commit | 115e3c80dfb3df454764cfad82cb572d84dcbb24 (patch) | |
| tree | 291300c47f746861eaef208b859f3a8d98007ee1 | |
| parent | 774a4bd4f4f6c91dda7c46550769349a522856f7 (diff) | |
| parent | decb9592ac7e4409ae83db29ef9e444efacf1897 (diff) | |
| download | rust-115e3c80dfb3df454764cfad82cb572d84dcbb24.tar.gz rust-115e3c80dfb3df454764cfad82cb572d84dcbb24.zip | |
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
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/mod.rs | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 454f197220c..7d7b73ebb42 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -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; } } diff --git a/src/libsyntax_ext/deriving/mod.rs b/src/libsyntax_ext/deriving/mod.rs index d5c8bada145..ca4d4fbc5bd 100644 --- a/src/libsyntax_ext/deriving/mod.rs +++ b/src/libsyntax_ext/deriving/mod.rs @@ -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; } }; |