Rollup of 14 pull requests #87413
Merged
Rollup of 14 pull requests #87413
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
For `HashSet` and `HashMap`, this simply copies the comment from `BinaryHeap::retain`. For `BTreeSet` and `BTreeMap`, this adds an additional guarantee that wasn't previously documented. I think that because these data structures are inherently ordered and other functions guarantee ordered iteration, it makes sense to provide this guarantee for `retain` as well.
using rust-lang#87076 (comment) as testcase
Unfortunately this requires a proper ./configure flag, as the codegen backends config entry is a list, not a string (breaking --set).
Previously it would error out:
```
$ x check --dry-run
thread 'main' panicked at 'std::fs::read_to_string(ci_llvm.join("link-type.txt")) failed with No such file or directory (os error 2) ("CI llvm missing: /home/joshua/rustc3/build/tmp-dry-run/x86_64-unknown-linux-gnu/ci-llvm")', src/bootstrap/config.rs:795:33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Build completed unsuccessfully in 0:00:10
```
add test for issue 86507 add stderr for issue 86507 update issue-86507 UI test add comment for the expected error in UI test file add proper 'refers to <ref_type>' in suggestion update diagnostic phrasing; update test to match new phrasing; re-organize logic for checking T: Sync evaluate additional obligation to figure out if T is Sync run './x.py test tidy --bless' incorporate changes from review; reorganize logic for readability
Otherwise is a bug that we want to uncover.
the new diagnostic messages
…i-obk VecMap::get_value_matching should return just one element r? `@nikomatsakis` Related to rust-lang#86465 and rust-lang#87287
…m-ou-se Document iteration order of `retain` functions For `HashSet` and `HashMap`, this simply copies the comment from `BinaryHeap::retain`. For `BTreeSet` and `BTreeMap`, this adds an additional guarantee that wasn't previously documented. I think that because these data structures are inherently ordered and other functions guarantee ordered iteration, it makes sense to provide this guarantee for `retain` as well.
…Simulacrum Remove Option from BufWriter Fixes rust-lang#72925
…ennytm Stabilize `into_parts()` and `into_error()` This stabilizes `IntoInnerError`'s `into_parts()` and `into_error()` methods, currently gated behind the `io_into_inner_error_parts` feature. The FCP has [already completed.](rust-lang#79704 (comment)) Closes rust-lang#79704.
…imulacrum Fix panics on Windows when the build was cancelled Fixes rust-lang#86499 cc `@jyn514`
…=Mark-Simulacrum Package LLVM libs for the target rather than the build host Fixes rust-lang#85250 `dist.rs` uses, in the `rust-dev` stage, `llvm-config --libfiles` to get a list of the LLVM library files built but of course only for the build host. If the target differs we want to package lib files from the target's build tree instead. This is done by splitting/rejoining the paths on their build directories. At the moment `tree` on the LLVM build directories seems to give almost identical output, but of course this might not be the case in the future. If a file is missing in the target's build tree then this stage will error in the `builder.install()` call. If the target build tree has an extra file then it silently won't be copied and we'll get a linker error when building using this artifact (via `download-ci-llvm = "if-available"`), though we would have received a linker error anyway without this change. There was also a typo in the example config around this option.
…Simulacrum better support for running libcore tests with Miri See rust-lang/miri-test-libstd#4 for a description of the problem that this fixes. Thanks to `@hyd-dev` for suggesting this patch!
…crum Add testcase for 87076 Closes rust-lang#87076 I also moved the issue tests into the issues subfolder, nothing changed there.
…ends, r=Mark-Simulacrum Add `--codegen-backends=foo,bar` configure flag Unfortunately this requires a proper `./configure` flag, as the codegen backends config entry is a list, not a string (breaking `--set`).
…send, r=estebank fix: clarify suggestion that `&T` must refer to `T: Sync` for `&T: Send` ### Description - [x] fix rust-lang#86507 - [x] add UI test for relevant code from issue - [x] change `rustc_trait_selection/src/traits/error_reporting/suggestions.rs` to include a more clear suggestion when `&T` fails to satisfy `Send` bounds due to the fact that `T` fails to implement `Sync` - [x] update UI test in Clippy: `src/tools/tests/ui/future_not_send.stderr`
Fix `--dry-run` when download-ci-llvm is set
Previously it would error out:
```
$ x check --dry-run
thread 'main' panicked at 'std::fs::read_to_string(ci_llvm.join("link-type.txt")) failed with No such file or directory (os error 2) ("CI llvm missing: /home/joshua/rustc3/build/tmp-dry-run/x86_64-unknown-linux-gnu/ci-llvm")', src/bootstrap/config.rs:795:33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Build completed unsuccessfully in 0:00:10
```
…r=Mark-Simulacrum Don't default to `submodules = true` unless the rust repo has a .git directory Should hopefully fix rust-lang#82653 (comment) - `@semarie` can you confirm? r? `@Mark-Simulacrum`
…ms, r=notriddle Add test for fonts used for module items Fixes rust-lang#85632. r? `@notriddle`
Add missing article Redo of rust-lang#87305. I messed up in that PR and wasn't sure how to fix it.
|
@bors r+ p=14 rollup=never |
|
📌 Commit a651581 has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Jul 23, 2021
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:
retainfunctions #86790 (Document iteration order ofretainfunctions)into_parts()andinto_error()#87175 (Stabilizeinto_parts()andinto_error())--codegen-backends=foo,barconfigure flag #87283 (Add--codegen-backends=foo,barconfigure flag)&Tmust refer toT: Syncfor&T: Send#87322 (fix: clarify suggestion that&Tmust refer toT: Syncfor&T: Send)--dry-runwhen download-ci-llvm is set #87358 (Fix--dry-runwhen download-ci-llvm is set)submodules = trueunless the rust repo has a .git directory #87380 (Don't default tosubmodules = trueunless the rust repo has a .git directory)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup