Skip to content

Fix range_covered_by_constructor for exclusive ranges. #43266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/librustc_const_eval/_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ fn slice_pat_covered_by_constructor(_tcx: TyCtxt, _span: Span,
Ok(true)
}

fn range_covered_by_constructor(tcx: TyCtxt, span: Span,
fn constructor_covered_by_range(tcx: TyCtxt, span: Span,
ctor: &Constructor,
from: &ConstVal, to: &ConstVal,
end: RangeEnd)
Expand All @@ -845,14 +845,14 @@ fn range_covered_by_constructor(tcx: TyCtxt, span: Span,
match *ctor {
ConstantValue(ref value) => {
let to = cmp_to(value)?;
let end = (to != Ordering::Greater) ||
(end == RangeEnd::Excluded && to == Ordering::Equal);
let end = (to == Ordering::Less) ||
(end == RangeEnd::Included && to == Ordering::Equal);
Ok(cmp_from(value)? && end)
},
ConstantRange(ref from, ref to, RangeEnd::Included) => {
let to = cmp_to(to)?;
let end = (to != Ordering::Greater) ||
(end == RangeEnd::Excluded && to == Ordering::Equal);
let end = (to == Ordering::Less) ||
(end == RangeEnd::Included && to == Ordering::Equal);
Ok(cmp_from(from)? && end)
},
ConstantRange(ref from, ref to, RangeEnd::Excluded) => {
Expand Down Expand Up @@ -933,7 +933,7 @@ fn specialize<'p, 'a: 'p, 'tcx: 'a>(
"unexpected const-val {:?} with ctor {:?}", value, constructor)
},
_ => {
match range_covered_by_constructor(
match constructor_covered_by_range(
cx.tcx, pat.span, constructor, value, value, RangeEnd::Included
) {
Ok(true) => Some(vec![]),
Expand All @@ -945,7 +945,7 @@ fn specialize<'p, 'a: 'p, 'tcx: 'a>(
}

PatternKind::Range { ref lo, ref hi, ref end } => {
match range_covered_by_constructor(
match constructor_covered_by_range(
cx.tcx, pat.span, constructor, lo, hi, end.clone()
) {
Ok(true) => Some(vec![]),
Expand Down
51 changes: 51 additions & 0 deletions src/test/ui/check_match/issue-43253.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(exclusive_range_pattern)]

fn main() {
// These cases should generate no warning.
match 10 {
1..10 => {},
10 => {},
_ => {},
}

match 10 {
1..10 => {},
9...10 => {},
_ => {},
}

match 10 {
1..10 => {},
10...10 => {},
_ => {},
}

// These cases should generate an "unreachable pattern" warning.
match 10 {
1..10 => {},
9 => {},
_ => {},
}

match 10 {
1..10 => {},
8...9 => {},
_ => {},
}

match 10 {
1..10 => {},
9...9 => {},
_ => {},
}
}
20 changes: 20 additions & 0 deletions src/test/ui/check_match/issue-43253.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
warning: unreachable pattern
--> $DIR/issue-43253.rs:36:9
|
36 | 9 => {},
| ^
|
= note: #[warn(unreachable_patterns)] on by default

warning: unreachable pattern
--> $DIR/issue-43253.rs:42:9
|
42 | 8...9 => {},
| ^^^^^

warning: unreachable pattern
--> $DIR/issue-43253.rs:48:9
|
48 | 9...9 => {},
| ^^^^^