Skip to content

Commit 391151d

Browse files
committed
Auto merge of #121770 - matthiaskrgr:rollup-wdher8r, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #110543 (Make `ReentrantLock` public) - #121689 ([rustdoc] Prevent inclusion of whitespace character after macro_rules ident) - #121724 (Use `LitKind::Err` for malformed floats) - #121735 (pattern analysis: Don't panic when encountering unexpected constructor) - #121743 (Opportunistically resolve regions when processing region outlives obligations) Failed merges: - #121326 (Detect empty leading where clauses on type aliases) - #121416 (Improve error messages for generics with default parameters) - #121669 (Count stashed errors again) - #121723 (Two diagnostic things) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a59d064 + 69b0bad commit 391151d

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-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

0 commit comments

Comments
 (0)