Skip to content
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

Reject negative literals for unsigned or char types in pattern ranges and literals #136304

Merged
merged 2 commits into from
Feb 6, 2025
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
12 changes: 10 additions & 2 deletions compiler/rustc_hir_typeck/src/pat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {

fn check_pat_expr_unadjusted(&self, lt: &'tcx hir::PatExpr<'tcx>) -> Ty<'tcx> {
let ty = match &lt.kind {
rustc_hir::PatExprKind::Lit { lit, .. } => {
self.check_expr_lit(lit, Expectation::NoExpectation)
rustc_hir::PatExprKind::Lit { lit, negated } => {
let ty = self.check_expr_lit(lit, Expectation::NoExpectation);
if *negated {
self.register_bound(
ty,
self.tcx.require_lang_item(LangItem::Neg, Some(lt.span)),
ObligationCause::dummy_with_span(lt.span),
);
}
ty
}
rustc_hir::PatExprKind::ConstBlock(c) => {
self.check_expr_const_block(c, Expectation::NoExpectation)
Expand Down
24 changes: 24 additions & 0 deletions tests/ui/type/pattern_types/signed_ranges.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#![feature(pattern_types)]
#![feature(pattern_type_macro)]

use std::pat::pattern_type;

type Sign = pattern_type!(u32 is -10..);
//~^ ERROR: cannot apply unary operator `-`

type SignedChar = pattern_type!(char is -'A'..);
//~^ ERROR: cannot apply unary operator `-`

fn main() {
match 42_u8 {
-10..253 => {}
//~^ ERROR `u8: Neg` is not satisfied
_ => {}
}

match 'A' {
-'\0'..'a' => {}
//~^ ERROR `char: Neg` is not satisfied
_ => {}
}
}
41 changes: 41 additions & 0 deletions tests/ui/type/pattern_types/signed_ranges.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
error[E0277]: the trait bound `u8: Neg` is not satisfied
--> $DIR/signed_ranges.rs:14:9
|
LL | -10..253 => {}
| ^^^ the trait `Neg` is not implemented for `u8`
Comment on lines +1 to +5
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried improving this error by having it point to where we got the u8 type information from (the scrutinee), but adding the right obligations for that didn't work out, so I'll need to do some more debugging.

But this is also the exact same diagnostic we get on stable and beta, so...

|
= help: the following other types implement trait `Neg`:
&f128
&f16
&f32
&f64
&i128
&i16
&i32
&i64
and 12 others

error[E0277]: the trait bound `char: Neg` is not satisfied
--> $DIR/signed_ranges.rs:20:9
|
LL | -'\0'..'a' => {}
| ^^^^^ the trait `Neg` is not implemented for `char`

error[E0600]: cannot apply unary operator `-` to type `u32`
--> $DIR/signed_ranges.rs:6:34
|
LL | type Sign = pattern_type!(u32 is -10..);
| ^^^ cannot apply unary operator `-`
|
= note: unsigned values cannot be negated

error[E0600]: cannot apply unary operator `-` to type `char`
--> $DIR/signed_ranges.rs:9:41
|
LL | type SignedChar = pattern_type!(char is -'A'..);
| ^^^^ cannot apply unary operator `-`

error: aborting due to 4 previous errors

Some errors have detailed explanations: E0277, E0600.
For more information about an error, try `rustc --explain E0277`.
Loading