Rollup merge of rust-lang#73194 - lzutao:INT-patterns, r=dtolnay

Prefer the associated constants for pattern matching error

Resolved this comment: rust-lang#68490 (comment)

src/librustc_middle/ty/print/pretty.rs

@@ -986,7 +986,7 @@ pub trait PrettyPrinter<'tcx>:
 
  let ui_str = ui.name_str();
  if data == max {
- p!(write("std::{}::MAX", ui_str))
+ p!(write("{}::MAX", ui_str))
  } else {
  if print_ty { p!(write("{}{}", data, ui_str)) } else { p!(write("{}", data)) }
  };
@@ -999,8 +999,8 @@ pub trait PrettyPrinter<'tcx>:
 
  let i_str = i.name_str();
  match data {
- d if d == min => p!(write("std::{}::MIN", i_str)),
- d if d == max => p!(write("std::{}::MAX", i_str)),
+ d if d == min => p!(write("{}::MIN", i_str)),
+ d if d == max => p!(write("{}::MAX", i_str)),
  _ => {
  let data = sign_extend(data, size) as i128;
  if print_ty {

src/test/mir-opt/const_prop/bad_op_div_by_zero/rustc.main.ConstProp.diff

@@ -59,7 +59,7 @@
  // mir::Constant
  // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
 - // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
-- _6 = Eq(const 1i32, const std::i32::MIN); // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
+- _6 = Eq(const 1i32, const i32::MIN); // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
 + // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 + _6 = const false; // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
  // ty::Const

src/test/mir-opt/const_prop/bad_op_mod_by_zero/rustc.main.ConstProp.diff

@@ -59,7 +59,7 @@
  // mir::Constant
  // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
 - // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
-- _6 = Eq(const 1i32, const std::i32::MIN); // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
+- _6 = Eq(const 1i32, const i32::MIN); // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
 + // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 + _6 = const false; // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
  // ty::Const

src/test/ui/consts/const-match-check.eval1.stderr

@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+error[E0005]: refutable pattern in local binding: `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  --> $DIR/const-match-check.rs:25:15
  |
 LL | A = { let 0 = 0; 0 },
- | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+ | ^ patterns `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  |
  = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
  = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html

src/test/ui/consts/const-match-check.eval2.stderr

@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+error[E0005]: refutable pattern in local binding: `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  --> $DIR/const-match-check.rs:31:24
  |
 LL | let x: [i32; { let 0 = 0; 0 }] = [];
- | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+ | ^ patterns `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  |
  = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
  = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html

src/test/ui/consts/const-match-check.matchck.stderr

@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+error[E0005]: refutable pattern in local binding: `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  --> $DIR/const-match-check.rs:4:22
  |
 LL | const X: i32 = { let 0 = 0; 0 };
- | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+ | ^ patterns `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  |
  = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
  = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
@@ -12,11 +12,11 @@ help: you might want to use `if let` to ignore the variant that isn't matched
 LL | const X: i32 = { if let 0 = 0 { /* */ } 0 };
  | ^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+error[E0005]: refutable pattern in local binding: `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  --> $DIR/const-match-check.rs:8:23
  |
 LL | static Y: i32 = { let 0 = 0; 0 };
- | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+ | ^ patterns `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  |
  = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
  = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
@@ -26,11 +26,11 @@ help: you might want to use `if let` to ignore the variant that isn't matched
 LL | static Y: i32 = { if let 0 = 0 { /* */ } 0 };
  | ^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+error[E0005]: refutable pattern in local binding: `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  --> $DIR/const-match-check.rs:13:26
  |
 LL | const X: i32 = { let 0 = 0; 0 };
- | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+ | ^ patterns `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  |
  = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
  = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
@@ -40,11 +40,11 @@ help: you might want to use `if let` to ignore the variant that isn't matched
 LL | const X: i32 = { if let 0 = 0 { /* */ } 0 };
  | ^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0005]: refutable pattern in local binding: `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+error[E0005]: refutable pattern in local binding: `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  --> $DIR/const-match-check.rs:19:26
  |
 LL | const X: i32 = { let 0 = 0; 0 };
- | ^ patterns `std::i32::MIN..=-1i32` and `1i32..=std::i32::MAX` not covered
+ | ^ patterns `i32::MIN..=-1i32` and `1i32..=i32::MAX` not covered
  |
  = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
  = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html

src/test/ui/consts/const-pattern-irrefutable.rs

@@ -9,8 +9,8 @@ use foo::d;
 const a: u8 = 2;
 
 fn main() {
- let a = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX
- let c = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX
- let d = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX
+ let a = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=u8::MAX
+ let c = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=u8::MAX
+ let d = 4; //~ ERROR refutable pattern in local binding: `0u8..=1u8` and `3u8..=u8::MAX
  fn f() {} // Check that the `NOTE`s still work with an item here (cf. issue #35115).
 }

src/test/ui/consts/const-pattern-irrefutable.stderr

@@ -1,4 +1,4 @@
-error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX` not covered
+error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=u8::MAX` not covered
  --> $DIR/const-pattern-irrefutable.rs:12:9
  |
 LL | const a: u8 = 2;
@@ -12,7 +12,7 @@ LL | let a = 4;
  |
  = note: the matched value is of type `u8`
 
-error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX` not covered
+error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=u8::MAX` not covered
  --> $DIR/const-pattern-irrefutable.rs:13:9
  |
 LL | pub const b: u8 = 2;
@@ -26,7 +26,7 @@ LL | let c = 4;
  |
  = note: the matched value is of type `u8`
 
-error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=std::u8::MAX` not covered
+error[E0005]: refutable pattern in local binding: `0u8..=1u8` and `3u8..=u8::MAX` not covered
  --> $DIR/const-pattern-irrefutable.rs:14:9
  |
 LL | pub const d: u8 = 2;

src/test/ui/for/for-loop-refutable-pattern-error-message.stderr

@@ -1,8 +1,8 @@
-error[E0005]: refutable pattern in `for` loop binding: `&std::i32::MIN..=0i32` and `&2i32..=std::i32::MAX` not covered
+error[E0005]: refutable pattern in `for` loop binding: `&i32::MIN..=0i32` and `&2i32..=i32::MAX` not covered
  --> $DIR/for-loop-refutable-pattern-error-message.rs:2:9
  |
 LL | for &1 in [1].iter() {}
- | ^^ patterns `&std::i32::MIN..=0i32` and `&2i32..=std::i32::MAX` not covered
+ | ^^ patterns `&i32::MIN..=0i32` and `&2i32..=i32::MAX` not covered
  |
  = note: the matched value is of type `&i32`