diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-05-13 22:46:20 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-05-22 20:20:12 +0300 |
| commit | a1885cdba38a63448ceec02f951ddc0844d0ff38 (patch) | |
| tree | 8c45eb2a7169a49b8a6e66fc3193c8d99ffc7632 /src/librustc_allocator | |
| parent | c389a39c9728d5c912a9ce1bc4c04eb1a3f31fe8 (diff) | |
| download | rust-a1885cdba38a63448ceec02f951ddc0844d0ff38.tar.gz rust-a1885cdba38a63448ceec02f951ddc0844d0ff38.zip | |
Restore the old behavior of the rustdoc keyword check + Fix rebase
Diffstat (limited to 'src/librustc_allocator')
| -rw-r--r-- | src/librustc_allocator/expand.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_allocator/expand.rs b/src/librustc_allocator/expand.rs index 0c19d770194..b9cd30694f6 100644 --- a/src/librustc_allocator/expand.rs +++ b/src/librustc_allocator/expand.rs @@ -19,7 +19,7 @@ use syntax::{ mut_visit::{self, MutVisitor}, parse::ParseSess, ptr::P, - symbol::{keywords, Symbol, sym} + symbol::{kw, sym, Symbol} }; use syntax_pos::Span; @@ -116,8 +116,7 @@ impl MutVisitor for ExpandAllocatorDirectives<'_> { // We will generate a new submodule. To `use` the static from that module, we need to get // the `super::...` path. - let super_path = - f.cx.path(f.span, vec![Ident::with_empty_ctxt(keywords::Super.name()), f.global]); + let super_path = f.cx.path(f.span, vec![Ident::with_empty_ctxt(kw::Super), f.global]); // Generate the items in the submodule let mut items = vec![ |