Rollup of 8 pull requests #106386
Merged
Rollup of 8 pull requests #106386
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
…ehavior Basically, passing the empty string will actually remove the extension instead of setting it to the empty string. This might change what is considered to be an extension. Additionally, passing an extension that contains dots will make the path only consider the last part of it to be the new extension.
- Avoid `/checkout/src/ci/run.sh: line 187: [: =: unary operator expected`: https://github.com/rust-lang/rust/actions/runs/3809902408/jobs/6481611301#step:26:1701 - Avoid running `x check` in the tidy test, to get faster feedback. It's already run on the normal `mingw-check` job.
Context is no longer Sync so this doesn't work.
error[E0277]: `*mut ()` cannot be shared between threads safely
--> library/core/tests/task.rs:24:21
|
24 | static CONTEXT: Context<'static> = Context::from_waker(&WAKER);
| ^^^^^^^^^^^^^^^^ `*mut ()` cannot be shared between threads safely
|
= help: within `Context<'static>`, the trait `Sync` is not implemented for `*mut ()`
= note: required because it appears within the type `PhantomData<*mut ()>`
= note: required because it appears within the type `Context<'static>`
= note: shared static variables must have a type that implements `Sync`
HIR debug output is currently very verbose, especially when used with the alternate (`#`) flag. This commit reduces the amount of noisy newlines by forcing a few small key types to stay on one line, which makes the output easier to read and scroll by. ``` $ rustc +after hello_world.rs -Zunpretty=hir-tree | wc -l 582 $ rustc +before hello_world.rs -Zunpretty=hir-tree | wc -l 932 ```
Add PhantomData marker to Context to make Context !Send and !Sync Adds `PhantomData<*mut ()>` to `Context` in order to allow for future `!Send` or `!Sync` additions to `Context`'s fields. This would allow for things like future single threaded async executor optimizations, or (re)adding `LocalWaker`, etc. Closes rust-lang#66481. Per rust-lang#66481 (comment), this is a breaking change that needs a Crater run as the next step. (So far have tested the change locally with `cargotest` on WSL)
…-ou-se Add notes and examples about non-intuitive `PathBuf::set_extension` behavior Basically, passing the empty string will actually remove the extension instead of setting it to the empty string. This might change what is considered to be an extension. Additionally, passing an extension that contains dots will make the path only consider the last part of it to be the new extension.
…gillot Reduce HIR debug output HIR debug output is currently very verbose, especially when used with the alternate (`#`) flag. This commit reduces the amount of noisy newlines by forcing a few small key types to stay on one line, which makes the output easier to read and scroll by. ``` $ rustc +after hello_world.rs -Zunpretty=hir-tree | wc -l 582 $ rustc +before hello_world.rs -Zunpretty=hir-tree | wc -l 932 ```
…dead Cleanup `mingw-tidy` docker job Fixes a couple small regressions from rust-lang#106048 and rust-lang#105714. - Avoid `/checkout/src/ci/run.sh: line 187: [: =: unary operator expected`: https://github.com/rust-lang/rust/actions/runs/3809902408/jobs/6481611301#step:26:1701 - Avoid running `x check` in the tidy test, to get faster feedback. It's already run on the normal `mingw-check` job. r? `@fee1-dead`
…GuillaumeGomez Rustdoc-Json: Report discriminant on all kinds of enum variant. Closes rust-lang#106299 Probably easier to review one commit at a time. r? `@GuillaumeGomez`
…edef-type-mismatch, r=notriddle Fix rustdoc ICE on bad typedef with mismatching types Fixes rust-lang#106226. Fixes rust-lang#105742. Fixes rust-lang#105737. Fixes rust-lang#105334. Fixes rust-lang#96287. In this case, it's ok to replace the panic with `rustc_error::raise` because the compiler provided us with a `Error`. r? `@notriddle`
Update books ## rust-lang/book 3 commits in a60f4316ec923a5ac2ed6a2eba6960edb832d855..2bd5d42c9956369132228da6409f0e68da56c51a 2022-12-22 21:37:10 UTC to 2022-12-22 21:36:14 UTC - fix macos installation problem (rust-lang/book#3469) - Update -guessing-game-tutorial incorrect output (rust-lang/book#3462) - FIX: IT repo updated (rust-lang/book#3454) ## rust-lang/nomicon 1 commits in dd37e21ccee43918ed18a71581bb2af537ffe4fc..8ca261268068d80c0969260fff15199bad87b587 2022-12-30 16:32:09 UTC to 2022-12-30 16:32:09 UTC - Discourage the use of transmute to construct invalid values (rust-lang/nomicon#388) ## rust-lang/rust-by-example 6 commits in 995df09b65c582eb6290ab7ea5d9485983eb4c37..8888f9428fe9a48f31de6bd2cef9b9bf80791edc 2023-01-01 12:53:50 UTC to 2022-12-21 10:18:31 UTC - types/alias: use io::{Result,Error} instead of Io{Result,Error} (rust-lang/rust-by-example#1660) - Fix sample code mismatching its comments (rust-lang/rust-by-example#1659) - fix: add missing space (rust-lang/rust-by-example#1658) - diverging: fix issues with example code (rust-lang/rust-by-example#1631) - Update enum.md (rust-lang/rust-by-example#1645) - Clean up Chapter 2 (Primitives) (rust-lang/rust-by-example#1651) ## rust-lang/rustc-dev-guide 5 commits in 8b42eb5f57d3d8ed2257a22d0e850d9db52afed3..b3e2a6e6c8a3aae5b5d950c63046f23bae07096d 2023-01-01 05:20:47 UTC to 2022-12-25 12:11:21 UTC - Add help for when you update a submodule by accident (rust-lang/rustc-dev-guide#1537) - Simplify "how to build and run" section (rust-lang/rustc-dev-guide#1528) - Replace `$TARGET` with `host` (rust-lang/rustc-dev-guide#1514) - Add more rebasing help (rust-lang/rustc-dev-guide#1536) - Fix rustc_borrowck crate name typo (rust-lang/rustc-dev-guide#1535)
…rrors Document some of the AST nodes Someone was confused about some of this on Zulip, added some docs We probably should make sure every last field/variant in the AST/HIR is documented at some point `@bors` rollup
rustbot
added
A-rustdoc-json
rustbot
added
T-rustdoc
|
@bors r+ rollup=never p=9 |
bors
added
S-waiting-on-bors
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
Actually that failure looks spurious... Let's retry CI. |
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR: previous master: 67d16171d7 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
This was referenced Jan 3, 2023
Closed
|
Finished benchmarking commit (481c9ba): comparison URL. Overall result: ❌ regressions - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. |
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.
Successful merges:
PathBuf::set_extensionbehavior #104298 (Add notes and examples about non-intuitivePathBuf::set_extensionbehavior)mingw-tidydocker job #106315 (Cleanupmingw-tidydocker job)Failed merges:
ctor_kindfromVariantStruct. #106356 (clean: Removector_kindfromVariantStruct.)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup