Commit 2db551e
committed
Auto merge of #147428 - matthiaskrgr:rollup-k3nlxlu, r=matthiaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang/rust#145495 (Use declarative macro for `#[derive(TryFromU32)]`)
- rust-lang/rust#147165 (test: Subtract code_offset from width for ui_testing)
- rust-lang/rust#147354 (Fix wrong span for hightlight for duplicated diff lines)
- rust-lang/rust#147395 (Improve diagnostics: update note and add help message)
- rust-lang/rust#147396 (Fluent tidy improvements)
- rust-lang/rust#147407 (Update books)
- rust-lang/rust#147413 (don't panic on extern with just multiple quotes in the name)
r? `@ghost`
`@rustbot` modify labels: rollupFile tree
2 files changed
+2
-2
lines changed- tests/ui
2 files changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
0 commit comments