update josh instructions #2575
Closed
update josh instructions #2575
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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.
Merge rustc changes back into the miri repo 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 🥳
use rustc-build-sysroot instead of xargo This uses my crate https://github.com/RalfJung/rustc-build-sysroot instead of xargo to do the sysroot builds. That has the advantage of simplifying the Miri setup process and saving significant amounts of CI time for Miri users (since they don't have to build xargo from source all the time). Also xargo has a lot more functionality than we need so this should be easier to maintain and tweak for our needs. With this, Miri no longer honors the `XARGO_RUST_SRC` env var to determine where the standard library sources are taken from. The README anyway says to use `MIRI_LIB_SRC` which will still work. TODO: - [x] add support for no-std targets - [x] test that this works in the rustc repo
bump rustc-build-sysroot This should fix sysroot build problems on nix.
oli-obk
reviewed
Sep 29, 2022
RalfJung
force-pushed
the
josh
branch
2 times, most recently
from
6c79a9b
to
07f1d72
Compare
|
☔ The latest upstream changes (presumably #2578) made this pull request unmergeable. Please resolve the merge conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This doesn't recommend the rebase yet as I am worried about what that will do to future syncs.
Cc #2569