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

Fix for rustc 1.17.0-nightly (6eb9960d3 2017-03-19)

Browse Source
This commit is contained in:
Enrico Schmitz
2017-03-20 23:51:14 +01:00
parent 2a04fe9652
commit f8df4aed0f
7 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
clippy_lints/src/utils/mod.rs
View File

@@ -678,17 +678,13 @@ fn parse_attrs<F: FnMut(u64)>(sess: &Session, attrs: &[ast::Attribute], name: &'
if attr.is_sugared_doc {
continue;
}
if let ast::MetaItemKind::NameValue(ref value) = attr.value.node {
if attr.name() == name {
if let LitKind::Str(ref s, _) = value.node {
if let Ok(value) = FromStr::from_str(&*s.as_str()) {
attr::mark_used(attr);
f(value)
} else {
sess.span_err(value.span, "not a number");
}
if let Some(ref value) = attr.value_str() {
if attr.name().map_or(false, |n| n == name) {
if let Ok(value) = FromStr::from_str(&*value.as_str()) {
attr::mark_used(attr);
f(value)
} else {
unreachable!()
sess.span_err(attr.span, "not a number");
}
}
}