-
Notifications
You must be signed in to change notification settings - Fork 12.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rollup of 10 pull requests #123054
Closed
Closed
Rollup of 10 pull requests #123054
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
Currently, if you attempt to run ui tests in a vendored build, you will see this failure ``` ---- [ui] tests/ui/issues/issue-21763.rs stdout ---- diff of stderr: 8 = note: required because it appears within the type `(Rc<()>, Rc<()>)` 9 = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send` 10 note: required because it appears within the type `hashbrown::map::HashMap<Rc<()>, Rc<()>, RandomState>` - --> $HASHBROWN_SRC_LOCATION + --> /rust/deps/hashbrown/src/map.rs:190:12 12 note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>` 13 --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL 14 note: required by a bound in `foo` ``` This happend because the code that attempts to remap `HASHBROWN_SRC_LOCATION` expects it to be under `hashbrown-$version`, which is the case in a normal cargo registry, but not when vendor, where by default crates may not have the version in their directory name. This change passes `--versioned-dirs` to `cargo vendor` to enforce that every crate includes the version in the subdir name, which fixes the ui test and brings `--enable-vendor` builds closer to normal ones.
…spans. This makes `-Zprint-type-sizes`'s output easier to read, because the name of an `async fn` is more immediately recognizable than its span. I also deleted the comment "FIXME(eddyb) should use `def_span`." because it appears to have already been fixed by commit 67727aa.
also extend the const fn reachability test
…ion(..)` but now is not Fixes rust-lang#84727
…orkingjubilee Fix a typo in the alloc::string::String docs
extend comments for reachability set computation I hope this is right. :) Please review carefully. r? `@tmiasko` Cc `@oli-obk` `@saethlin`
…nur-ozkan fix(bootstrap/dist): use versioned dirs when vendoring Currently, if you attempt to run ui tests in a vendored build, you will see this failure ``` ---- [ui] tests/ui/issues/issue-21763.rs stdout ---- diff of stderr: 8 = note: required because it appears within the type `(Rc<()>, Rc<()>)` 9 = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send` 10 note: required because it appears within the type `hashbrown::map::HashMap<Rc<()>, Rc<()>, RandomState>` - --> $HASHBROWN_SRC_LOCATION + --> /rust/deps/hashbrown/src/map.rs:190:12 12 note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>` 13 --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL 14 note: required by a bound in `foo` ``` This happens because the code that attempts to remap `HASHBROWN_SRC_LOCATION` expects it to be under `hashbrown-$version`, which is the case in a normal cargo registry, but not when vendoring, where by default crates may not have the version in their directory name. This change passes `--versioned-dirs` to `cargo vendor` to enforce that every crate includes the version in the subdir name, which fixes the ui test and brings `--enable-vendor` builds closer to normal ones.
Update stdarch submodule r? ``@Amanieu``
…-errors In `pretty_print_type()`, print `async fn` futures' paths instead of spans. This makes `-Zprint-type-sizes`'s output easier to read, because the name of an `async fn` is more immediately recognizable than its span. This change will also synergize with my other `-Zprint-type-sizes` PR rust-lang#122922 which prints the type of child futures being awaited. I also deleted the comment "FIXME(eddyb) should use `def_span`." because it appears to have already been fixed by commit 67727aa.
… r=workingjubilee Port backtrace dylib-dep test to a ui test Original test: [dylib-dep](https://github.com/rust-lang/backtrace-rs/tree/6fa4b85b9962c3e1be8c2e5cc605cd078134152b/crates/dylib-dep) Part of rust-lang#122899.
Update books ## rust-lang/edition-guide 1 commits in e1eead1181a691e56299294d5f1d62fe7a26d317..98b33e9a441457b0a491fe1be90e7de64eafc3e5 2024-03-23 14:17:26 UTC to 2024-03-23 14:17:26 UTC - remove indication that C string literals don't exist yet (rust-lang/edition-guide#295) ## rust-lang/reference 4 commits in 5afb503a4c1ea3c84370f8f4c08a1cddd1cdf6ad..984b36eca4b9293df04d5ba4eb5c4f77db0f51dc 2024-03-25 14:05:19 UTC to 2024-03-19 20:01:14 UTC - Fix typo of shebang (rust-lang/reference#1486) - Document importing `main` (rust-lang/reference#1461) - add grammar for `associated_type_bounds` in reference (rust-lang/reference#1481) - Literal expressions: fix mistake in the definition of unicode escapes (rust-lang/reference#1483) ## rust-lang/rust-by-example 1 commits in e093099709456e6fd74fecd2505fdf49a2471c10..7601e0c5ad29d5bd3b518700ea63fddfff5915a7 2024-03-17 21:37:25 UTC to 2024-03-17 21:37:25 UTC - Update enum_use.md to use a more neutral theme (rust-lang/rust-by-example#1828) ## rust-lang/rustc-dev-guide 12 commits in 8a5d647..ffa246b 2024-03-23 07:44:42 UTC to 2024-03-11 18:17:28 UTC - [MCP 723] Rename AstConv to HIR ty lowering (rust-lang/rustc-dev-guide#1916) - add chapter to summary (rust-lang/rustc-dev-guide#1947) - document difference between solvers + new solver normalization (rust-lang/rustc-dev-guide#1945) - Fix broken link in chapter '1. How to build and run the compiler' (rust-lang/rustc-dev-guide#1946) - typo (rust-lang/rustc-dev-guide#1944) - Reflect rustc_codegen_cranelift move (rust-lang/rustc-dev-guide#1941) - Update rustdoc-internals.md (rust-lang/rustc-dev-guide#1911) - Update test-implementation.md (rust-lang/rustc-dev-guide#1937) - Extract Bootstrap into its own section (rust-lang/rustc-dev-guide#1939) - typos (rust-lang/rustc-dev-guide#1938) - More updates for recent diagnostics changes. (rust-lang/rustc-dev-guide#1936) - Update bibliography.md (rust-lang/rustc-dev-guide#1912)
`Instance` is `Copy` No reason to take it by value; it was confusing `@rcvalle` to see it being mutated when it's also being passed by ref in some places.
…bilee did I mention that tests are super cool? Fixes rust-lang#81974 Fixes rust-lang#84727 Fixes rust-lang#92979
rustbot
added
PG-exploit-mitigations
Project group: Exploit mitigations
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
T-libs
Relevant to the library team, which will review and decide on the PR/issue.
rollup
A PR which is a rollup
labels
Mar 25, 2024
@bors r+ rollup=never p=8 |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 25, 2024
I can't count. @bors p=10 |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 25, 2024
…kingjubilee Rollup of 10 pull requests Successful merges: - rust-lang#122707 (Fix a typo in the alloc::string::String docs) - rust-lang#122769 (extend comments for reachability set computation) - rust-lang#122892 (fix(bootstrap/dist): use versioned dirs when vendoring) - rust-lang#122896 (Update stdarch submodule) - rust-lang#122923 (In `pretty_print_type()`, print `async fn` futures' paths instead of spans.) - rust-lang#122950 (Add regression tests for rust-lang#101903) - rust-lang#122958 (Port backtrace dylib-dep test to a ui test) - rust-lang#123039 (Update books) - rust-lang#123044 (`Instance` is `Copy`) - rust-lang#123051 (did I mention that tests are super cool? ) r? `@ghost` `@rustbot` modify labels: rollup
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 25, 2024
The job Click to see the possible cause of the failure (guessed by this bot)
|
Well that wasn't surprising! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
PG-exploit-mitigations
Project group: Exploit mitigations
rollup
A PR which is a rollup
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
T-libs
Relevant to the library team, which will review and decide on the PR/issue.
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:
pretty_print_type()
, printasync fn
futures' paths instead of spans. #122923 (Inpretty_print_type()
, printasync fn
futures' paths instead of spans.)Instance
isCopy
#123044 (Instance
isCopy
)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup