rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use sym::{all,any,main,not} more.

Browse Source
This commit is contained in:
Nicholas Nethercote
2019-09-05 06:43:03 +10:00
parent 2b8116dced
commit c36d7d4834
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustdoc/clean/cfg.rs
View File

@@ -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 {

2
src/librustdoc/test.rs
View File

@@ -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;
}
}