Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2133 from sinkuu/fix_panic

Browse source 
Fix panic with fake `Range` type
This commit is contained in:
llogiq 2017-10-14 22:22:39 +02:00 committed by GitHub
commit 6e4779be5f
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clippy_lints/src/utils/higher.rs
View file

@ -50,8 +50,7 @@ pub fn range(expr: &hir::Expr) -> Option<Range> {
fn get_field<'a>(name: &str, fields: &'a [hir::Field]) -> Option<&'a hir::Expr> {
let expr = &fields
.iter()
.find(|field| field.name.node == name)
.unwrap_or_else(|| panic!("missing {} field for range", name))
.find(|field| field.name.node == name)?
.expr;
Some(expr)
@ -77,32 +76,32 @@ pub fn range(expr: &hir::Expr) -> Option<Range> {
match_qpath(path, &paths::RANGE_FROM)
{
Some(Range {
start: get_field("start", fields),
start: Some(get_field("start", fields)?),
end: None,
limits: ast::RangeLimits::HalfOpen,
})
} else if match_qpath(path, &paths::RANGE_INCLUSIVE_STD) || match_qpath(path, &paths::RANGE_INCLUSIVE) {
Some(Range {
start: get_field("start", fields),
end: get_field("end", fields),
start: Some(get_field("start", fields)?),
end: Some(get_field("end", fields)?),
limits: ast::RangeLimits::Closed,
})
} else if match_qpath(path, &paths::RANGE_STD) || match_qpath(path, &paths::RANGE) {
Some(Range {
start: get_field("start", fields),
end: get_field("end", fields),
start: Some(get_field("start", fields)?),
end: Some(get_field("end", fields)?),
limits: ast::RangeLimits::HalfOpen,
})
} else if match_qpath(path, &paths::RANGE_TO_INCLUSIVE_STD) || match_qpath(path, &paths::RANGE_TO_INCLUSIVE) {
Some(Range {
start: None,
end: get_field("end", fields),
end: Some(get_field("end", fields)?),
limits: ast::RangeLimits::Closed,
})
} else if match_qpath(path, &paths::RANGE_TO_STD) || match_qpath(path, &paths::RANGE_TO) {
Some(Range {
start: None,
end: get_field("end", fields),
end: Some(get_field("end", fields)?),
limits: ast::RangeLimits::HalfOpen,
})
} else {

9
tests/ui/range.rs
View file

@ -32,3 +32,12 @@ fn main() {
// check const eval
let _ = v1.iter().step_by(2/3);
}
#[allow(unused)]
fn no_panic_with_fake_range_types() {
struct Range {
foo: i32,
}
let _ = Range { foo: 0 };
}