Commit 5095101
committed
Auto merge of rust-lang#67752 - Dylan-DPC:rollup-7f9v4nx, r=Dylan-DPC
Rollup of 5 pull requests
Successful merges:
- rust-lang#67430 (doc: minus (U+2212) instead of dash (U+002D) for negative infinity)
- rust-lang#67697 (Move the region_scope_tree query to librustc_passes.)
- rust-lang#67719 (Add self to .mailmap)
- rust-lang#67723 (Add error code explanation for E0477)
- rust-lang#67735 (Support `-Z ui-testing=yes/no`)
Failed merges:
r? @ghostFile tree
23 files changed
+921
-909
lines changed- src
- libcore/num
- librustc_error_codes
- error_codes
- librustc_interface
- librustc_passes
- librustc_session
- librustc/middle
- librustdoc
- test/ui
- issues
- kindck
- regions
- tools/compiletest/src
23 files changed
+921
-909
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| 142 | + | |
142 | 143 | | |
143 | 144 | | |
144 | 145 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| |||
0 commit comments