Skip to content

Commit a673d8d

Browse files
committed
Auto merge of rust-lang#3336 - RalfJung:rustup, r=RalfJung
Rustup Also add regression test for rust-lang/rust#121508.
2 parents 83d23fa + d80bd23 commit a673d8d

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

tests/ui/crashes/ice-10912.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@
22
//@no-rustfix
33
fn f2() -> impl Sized { && 3.14159265358979323846E }
44
//~^ ERROR: expected at least one digit in exponent
5-
//~| ERROR: long literal lacking separators
6-
//~| NOTE: `-D clippy::unreadable-literal` implied by `-D warnings`
75

86
fn main() {}

tests/ui/crashes/ice-10912.stderr

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,5 @@ error: expected at least one digit in exponent
44
LL | fn f2() -> impl Sized { && 3.14159265358979323846E }
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66

7-
error: long literal lacking separators
8-
--> tests/ui/crashes/ice-10912.rs:3:28
9-
|
10-
LL | fn f2() -> impl Sized { && 3.14159265358979323846E }
11-
| ^^^^^^^^^^^^^^^^^^^^^^^ help: consider: `3.141_592_653_589_793_238_46`
12-
|
13-
= note: `-D clippy::unreadable-literal` implied by `-D warnings`
14-
= help: to override `-D warnings` add `#[allow(clippy::unreadable_literal)]`
15-
16-
error: aborting due to 2 previous errors
7+
error: aborting due to 1 previous error
178

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
struct Foo(isize, isize, isize, isize);
2+
3+
pub fn main() {
4+
let Self::anything_here_kills_it(a, b, ..) = Foo(5, 5, 5, 5);
5+
match [5, 5, 5, 5] {
6+
[..] => { }
7+
}
8+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
error[E0433]: failed to resolve: `Self` is only available in impls, traits, and type definitions
2+
--> tests/ui/crashes/unreachable-array-or-slice.rs:4:9
3+
|
4+
LL | let Self::anything_here_kills_it(a, b, ..) = Foo(5, 5, 5, 5);
5+
| ^^^^ `Self` is only available in impls, traits, and type definitions
6+
7+
error: aborting due to 1 previous error
8+
9+
For more information about this error, try `rustc --explain E0433`.

0 commit comments

Comments
 (0)