Merge rustc changes back into the miri repo #2568
Conversation
…b33573' git-subtree-dir: src/tools/miri git-subtree-mainline: 3f3167fb59341ac3240ca1774f48e8c053219131 git-subtree-split: 75dd959
add regression test for miri issue 2433 Adding this here because the test needs to be run with debug assertions enabled to be sure so I had to run it in the rustc workspace. Cc rust-lang#2433 r? ``@oli-obk``
rustdoc: clean up CSS/DOM for deprecation warnings Preview: https://notriddle.com/notriddle-rustdoc-test/stab-p/std/macro.try.html
Fix a typo in `std`'s root docs Remarkably, this typo has been present for *seven years.* I was so surprised that I reread the text five times and then asked people on the rust Zulip to double-check. :)
Rollup of 7 pull requests Successful merges: - #102094 (Add missing documentation for `bool::from_str`) - #102115 (Add examples to `bool::then` and `bool::then_some`) - #102134 (Detect panic strategy using `rustc --print cfg`) - #102137 (Don't convert valtree to constvalue during normalization) - #102148 (add regression test for miri issue 2433) - #102158 (rustdoc: clean up CSS/DOM for deprecation warnings) - #102177 (Fix a typo in `std`'s root docs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Always print '_, even for erased lifetimes. Explicit lifetime arguments are now the recommended syntax in rust 2018 and rust 2021. This PR applies this discipline to rustc itself.
Revert perf-regression 101620 Reverts #101862 #101620 r? `@Mark-Simulacrum`
Add `#[inline]` to trivial functions on `core::sync::Exclusive` When optimizing for size things like these sometimes don't inlined even though they're generic. This is bad because they're no-ops. Only dodgy one is poll I guess since it forwards to the inner poll, but it's not like we're doing `#[inline(always)]` here.
|
@bors r+ |
|
I don't quite recognize our use-case in what Josh advertises itself for but if it works 🤷 I'm not super happy about having to run a docker container for the sync, let's hope the infra team automates this soon :) |
FWIW I did that earlier with git-subtree while testing #2564 and it worked very well. |
yea, but I wanna make sure that josh and git-subtree work fine, and we don't make rustc-to-miri syncs harder due to git subtree in the other direction being weird (I don't think it is, but need to try it out) |
|
Looks like bors is on strike again so I guess that gives us time to at least fix the typo I noted. ;) |
that's just me being lazy and following the instructions. I belive a |
|
@bors r+ |
|
@bors ping |
|
😪 I'm awake I'm awake |
|
@bors r- |
|
@oli-obk bors seems to work again... why did you r- this? |
|
@bors r+ I wanted to cycle the PR as it didn't work |
|
The other PR was merged and this one didn't start |
|
@bors r+ |
|
💡 This pull request was already approved, no need to approve it again. |
|
☀️ Test successful - checks-actions |
This uses https://github.com/josh-project/josh (RIIR ftw)
The first time it looks a bit odd with the merges and so, all future syncs will work just like the instructions say. I'll add instructions for the sync from miri to rustc, too, starting to do that right now.
Initial cache building now takes 5 mins 🥳