Rollup of 4 pull requests#152714
Closed
JonathanBrouwer wants to merge 82 commits intorust-lang:mainfrom
Closed
Conversation
This updates the rust-version file to 5a07626.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@5a07626 Filtered ref: rust-lang/miri@cc20862 Upstream diff: rust-lang/rust@d10ac47...5a07626 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
document guidelines for which shims have a place in Miri
This updates the rust-version file to 873d468.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@873d468 Filtered ref: rust-lang/miri@57f1e8b Upstream diff: rust-lang/rust@5a07626...873d468 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
This updates the rust-version file to e96bb7e.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@e96bb7e Filtered ref: rust-lang/miri@4304ab0 Upstream diff: rust-lang/rust@873d468...e96bb7e This merge was created using https://github.com/rust-lang/josh-sync.
add a bug to the trophy shelf
Automatic Rustup
This updates the rust-version file to 35a31ba.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@35a31ba Filtered ref: rust-lang/miri@b436646 Upstream diff: rust-lang/rust@e96bb7e...35a31ba This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
trophy case: oneshot data race
This updates the rust-version file to 878374e.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 878374e Filtered ref: a46a01d9de0d6a8cb834a0cc04b9156d61493c39 Upstream diff: rust-lang/rust@35a31ba...878374e This merge was created using https://github.com/rust-lang/josh-sync.
and reset MIRIFLAGS as well just to be safe
`./miri run --dep`: do not run Miri during the dependency build
…eatures chore: limit capstone to x86 and arm
re-balance CI
needed for chacha20
…ntrinsics Feat: aarch64 intrinsics to make MIRI work on chacha20
chore: fix typos suggested by typos-cli
src/concurrency/weak_memory.rs made -> marked
This updates the rust-version file to 7bee525.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@7bee525 Filtered ref: rust-lang/miri@c878532 Upstream diff: rust-lang/rust@47611e1...7bee525 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
miri subtree update Subtree update of `miri` to rust-lang/miri@ef30e90. Created using https://github.com/rust-lang/josh-sync. r? @ghost
misc doc improvements These are things I collected as I was looking at code and docs
…uillaumeGomez Fix mis-constructed `file_span` when generating scraped examples Fixes rust-lang#152601. Seemingly relative with rust-lang#147399 but I could not reproduce the original ICE. This PR removes the `file_span` logic from scraped example generation. The original implementation did not read or write items using `file_span`; it only used it to locate a source file, `context.href_from_span`. However, the span was validated against the wrong file, which could trigger ICEs on inputs such as multibyte characters due to an incorrectly constructed span. Since scraped examples do not use the span and the `url` is already given, the safest and simplest fix is to remove it. Tested against the crate and MCVE documented in the original issue. P.S. there seems to be some bug when rendering call sites, but since fixing mis-behavior is a change rather than a bug-fix that would be implemented in another PR.
Suppress unstable-trait notes under `-Zforce-unstable-if-unmarked` - Fixes rust-lang#152692. --- rust-lang#151036 adds extra diagnostic text (“the nightly-only, unstable trait”) to note when a not-implemented trait is unstable. However, that extra text is usually unhelpful when building a crate graph with `-Zforce-unstable-if-unmarked` (such as the compiler or stdlib), because *any* trait not explicitly marked stable will be treated as unstable. (For typical compiler contributors using the stage0 compiler, this fix won't take effect until the next bootstrap beta bump.)
rustbot
added
S-waiting-on-review
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
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.
Successful merges:
file_spanwhen generating scraped examples #152664 (Fix mis-constructedfile_spanwhen generating scraped examples)-Zforce-unstable-if-unmarked#152698 (Suppress unstable-trait notes under-Zforce-unstable-if-unmarked)r? @ghost
Create a similar rollup