diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2019-09-05 06:43:03 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2019-09-09 08:27:40 +1000 |
| commit | c36d7d48345b4748596e51994e1696abde912e44 (patch) | |
| tree | 74ccee81c6086a5b95bc874e775fa004fde39fd4 /src | |
| parent | 2b8116dced2c6c5d02e1c4359e89dc0919d6001b (diff) | |
| download | rust-c36d7d48345b4748596e51994e1696abde912e44.tar.gz rust-c36d7d48345b4748596e51994e1696abde912e44.zip | |
Use `sym::{all,any,main,not}` more.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/clean/cfg.rs | 8 | ||||
| -rw-r--r-- | src/librustdoc/test.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs index b9b3e621bb7..c3092cea983 100644 --- a/src/librustdoc/clean/cfg.rs +++ b/src/librustdoc/clean/cfg.rs @@ -81,10 +81,10 @@ impl Cfg { }, MetaItemKind::List(ref items) => { let mut sub_cfgs = items.iter().map(Cfg::parse_nested); - match &*name.as_str() { - "all" => sub_cfgs.fold(Ok(Cfg::True), |x, y| Ok(x? & y?)), - "any" => sub_cfgs.fold(Ok(Cfg::False), |x, y| Ok(x? | y?)), - "not" => if sub_cfgs.len() == 1 { + match name { + sym::all => sub_cfgs.fold(Ok(Cfg::True), |x, y| Ok(x? & y?)), + sym::any => sub_cfgs.fold(Ok(Cfg::False), |x, y| Ok(x? | y?)), + sym::not => if sub_cfgs.len() == 1 { Ok(!sub_cfgs.next().unwrap()?) } else { Err(InvalidCfgError { diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 000d2843adc..fe2be682ec5 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -407,7 +407,7 @@ pub fn make_test(s: &str, Ok(Some(item)) => { if !found_main { if let ast::ItemKind::Fn(..) = item.node { - if item.ident.as_str() == "main" { + if item.ident.name == sym::main { found_main = true; } } |