Commit ce0b647
committed
Auto merge of #159579 - JonathanBrouwer:rollup-TlvztYP, r=JonathanBrouwer
Rollup of 5 pull requests
Successful merges:
- rust-lang/rust#159188 (Always generate private and hidden items in JSON docs of the stdlib)
- rust-lang/rust#159567 (Update rustc crate crossbeam-epoch to 0.9.20)
- rust-lang/rust#150732 (Convert `-Ctarget-cpu` into a target-modifier for AVR, AMDGCN and NVPTX )
- rust-lang/rust#159549 (restrict const-eval-related 'content' triggers to library/ folder)
- rust-lang/rust#159570 (fix ICE in opsem inhabitedness check)1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
341 | 341 | | |
342 | 342 | | |
343 | 343 | | |
344 | | - | |
| 344 | + | |
345 | 345 | | |
346 | 346 | | |
347 | 347 | | |
| |||
0 commit comments