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/libsyntax/attr | |
| 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/libsyntax/attr')
| -rw-r--r-- | src/libsyntax/attr/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs index 3e93ac23a53..a97c094418d 100644 --- a/src/libsyntax/attr/mod.rs +++ b/src/libsyntax/attr/mod.rs @@ -22,7 +22,7 @@ use crate::parse::parser::Parser; use crate::parse::{self, ParseSess, PResult}; use crate::parse::token::{self, Token}; use crate::ptr::P; -use crate::symbol::{kw, sym, Symbol}; +use crate::symbol::{sym, Symbol}; use crate::ThinVec; use crate::tokenstream::{TokenStream, TokenTree, DelimSpan}; use crate::GLOBALS; @@ -206,7 +206,7 @@ impl MetaItem { } } pub fn name_or_empty(&self) -> Symbol { - self.ident().unwrap_or(Ident.invalid()).name + self.ident().unwrap_or(Ident::invalid()).name } // #[attribute(name = "value")] |