Commit e479c70
committed
Auto merge of rust-lang#104387 - Manishearth:rollup-9e551p5, r=Manishearth
Rollup of 9 pull requests
Successful merges:
- rust-lang#103709 (ci: Upgrade dist-x86_64-netbsd to NetBSD 9.0)
- rust-lang#103744 (Upgrade cc for working is_flag_supported on cross-compiles)
- rust-lang#104105 (llvm: dwo only emitted when object code emitted)
- rust-lang#104158 (Return .efi extension for EFI executable)
- rust-lang#104181 (Add a few known-bug tests)
- rust-lang#104266 (Regression test for coercion of mut-ref to dyn-star)
- rust-lang#104300 (Document `Path::parent` behavior around relative paths)
- rust-lang#104304 (Enable profiler in dist-s390x-linux)
- rust-lang#104362 (Add `delay_span_bug` to `AttrWrapper::take_for_recovery`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup2 files changed
+13
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2142 | 2142 | | |
2143 | 2143 | | |
2144 | 2144 | | |
2145 | | - | |
| 2145 | + | |
| 2146 | + | |
| 2147 | + | |
| 2148 | + | |
2146 | 2149 | | |
2147 | 2150 | | |
2148 | 2151 | | |
| |||
2156 | 2159 | | |
2157 | 2160 | | |
2158 | 2161 | | |
| 2162 | + | |
| 2163 | + | |
| 2164 | + | |
| 2165 | + | |
| 2166 | + | |
| 2167 | + | |
| 2168 | + | |
| 2169 | + | |
2159 | 2170 | | |
2160 | 2171 | | |
2161 | 2172 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
0 commit comments