Rollup of 28 pull requests#157735
Closed
jhpratt wants to merge 83 commits into
Closed
Conversation
On some platforms, it looks like these are not currently Send/Sync. We have a negative impl in env/common.rs. This is a breaking change on a bunch of targets, but it makes it less likely that someone unintentionally/accidentally depends on this. This is a potentially partial list but should be fairly complete: aarch64-unknown-none, aarch64-unknown-none-softfloat, armv7a-none-eabi, armv7a-none-eabihf, armv7r-none-eabi, armv7r-none-eabihf, armv8r-none-eabihf, loongarch64-unknown-none, loongarch64-unknown-none-softfloat, nvptx64-nvidia-cuda, riscv32i-unknown-none-elf, riscv32im-unknown-none-elf, riscv32imac-unknown-none-elf, riscv32imafc-unknown-none-elf, riscv32imc-unknown-none-elf, riscv64gc-unknown-none-elf, riscv64imac-unknown-none-elf, s390x-unknown-none-softfloat, thumbv6m-none-eabi, thumbv7a-none-eabi, thumbv7a-none-eabihf, thumbv7em-none-eabi, thumbv7em-none-eabihf, thumbv7m-none-eabi, thumbv7r-none-eabi, thumbv7r-none-eabihf, thumbv8m.base-none-eabi, thumbv8m.main-none-eabi, thumbv8m.main-none-eabihf, thumbv8r-none-eabihf, wasm32-unknown-unknown, wasm32v1-none, x86_64-unknown-none
WF-checking walks through higher-ranked binders without instantiating them, so a `dyn Trait` nested inside a `for<'a>` bound reaches the `ty::Dynamic` arm of `WfPredicates::visit_ty` while still carrying escaping bound vars. Feeding that type into `ExistentialTraitRef::with_self_ty` violated its no-escaping-self precondition and tripped the assertion that guards it. The trait ref built there is only used to read off `ConstArgHasType` clauses, which constrain the trait's own const arguments and never mention the `Self` type. Substitute a fresh placeholder self type when the real one escapes: the assertion holds and the const-argument check is still performed. Re-enable the `with_self_ty` debug assertion now that its precondition is upheld.
One test covers the original ICE (a `dyn Trait` nested in a `for<'a>` bound, distilled from itertools). The other locks in that a const argument on such a nested `dyn` is still type-checked, so the placeholder-self-type fix cannot silently regress into dropping the `ConstArgHasType` check.
…projection normalization
The in-memory dep graph kept for `-Zquery-dep-graph` is built by `GraphEncoder::record`, which pushed each node using `try_lock` and silently dropped the node when the lock was contended. Single-threaded the only contention is a query forced re-entrantly from within `with_retained_dep_graph`, so dropping was harmless. Under the parallel frontend several encoder threads record nodes at the same time, so a contended `try_lock` dropped nodes and edges at random, leaving the retained graph nondeterministic and making the dep-graph ui tests, which assert on its contents, fail intermittently. Remove that reentrancy in `check_paths`: read the graph into owned results while the lock is held, then emit the diagnostics afterwards. The only query forced inside the old closure was `def_path_str` (for the error messages), which can create dep nodes and re-enter the encoder; doing the emission after the lock is released means `record` never re-enters while the lock is held. `record` can then block on the lock unconditionally instead of using `try_lock`, so concurrent encoders never drop a node or edge. This only affects compilation with `-Zquery-dep-graph`; with the flag off the retained graph is absent and nothing changes.
These tests assert on the contents of the retained dep graph, which is now built deterministically under the parallel frontend, so they no longer need to be ignored there. Replace the ignore-parallel-frontend directives with blank lines rather than deleting them, so the following line numbers stay the same and the expected output is unchanged.
And rename a struct field.
This gets rid of the `printable.py` script, ensuring that `unicode-table-generator` handles all our Unicode data table generation needs. I've elected to give each Unicode property its own table, instead of merging them all into one. This is slightly less efficient in terms of space, but should allow us to expose these tables in the future with public methods on `char`.
These characters may be hidden/invisible otherwise.
…r=petrochenkov compiletest: ignore SVG `y` offset in by-lines comparison Tracked in rust-lang#154314. Closes rust-lang#157606 SVG diagnostic snapshots render one terminal row per line, laid out top to bottom. Under the parallel front-end, independent diagnostics can be emitted in a different order. That permutes the rows and re-renders each one at a different vertical `y` offset, even though the content of every row is unchanged. This change strips the `y` coordinate (and the `<svg>` header line, whose width and height are already ignored by the exact comparison) before the multiset comparison, so a reordering of whole rows is no longer treated as a difference.
Add `or_try_*` variants for `HashMap` and `BTreeMap` Entry APIs This PR builds on [peterjoel's introduction of `or_try_*` variants for `HashMap`](rust-lang#120708) from the following [ACP](rust-lang/libs-team#336) Peter made. The tracking issue for this PR is [here](rust-lang#157354).
…=fmease Fix parser error recovery treating 'dyn' as a strict keyword in Rust 2015 when used in `dyn + dyn` Fixes: rust-lang#157565 ### Description A diagnostics improvement rust-lang#84896 in 2015 edition caused errors when `dyn + dyn` was used, even though `dyn` is a contextual keyword in the 2015 edition. ### Solution A check was added in `rustc_parse/src/parser/ty.rs:1095`: ```rust if self.token.is_keyword(kw::Dyn) && self.token.span.edition().at_least_rust_2018() { ``` This checks that the version is not 2015 before throwing an error. A regression test was also added, in `tests/ui/parser/dyn-2015-identifier.rs`
… r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (4/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer
…t, r=petrochenkov Move symbol hiding code to a new file Move the symbol visibility editing code (`apply_hide` and helpers) from `archive.rs` into a new `symbol_edit.rs` module. This is a pure code move with no functional changes — extracted to reduce the size of `archive.rs` and to provide a natural home for future symbol editing logic (e.g. renaming, rust-lang#156950). Requested in rust-lang#156950 (comment). r? @petrochenkov
…2, r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (5/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer
…apin Fix doc link to Instant sub in saturating caveat The `sub` link in the caveat about saturating subtraction for `Instant` was linking to the wrong implementation of `sub`. On https://doc.rust-lang.org/std/time/struct.Instant.html it was linking to `Instant - Duration` which in fact *is not saturating*, and *will* panic. It should link to `Instant - Instant`.
rustbot
added
A-CI
Member
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors
Bot
added
the
S-waiting-on-author
Contributor
|
This pull request was unapproved due to being closed. |
rust-bors
Bot
removed
the
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
20 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:
ConstArgHasTypewhen normalizing projection consts #154853 (mgca: RegisterConstArgHasTypewhen normalizing projection consts)unicode_data.rstables #155527 (Replace printables table withunicode_data.rstables)browser-ui-testversion to0.24.0#157611 (Updatebrowser-ui-testversion to0.24.0)atexithook whencleanupcan be unloaded #157645 (Windows TLS - Only register theatexithook whencleanupcan be unloaded)TypeRelativePath::AssocItemto useAliasTerm#155323 (refactorTypeRelativePath::AssocItemto useAliasTerm)IsTypeConstfromhir::TraitItemKind#157330 (removeIsTypeConstfromhir::TraitItemKind)yoffset in by-lines comparison #157350 (compiletest: ignore SVGyoffset in by-lines comparison)or_try_*variants forHashMapandBTreeMapEntry APIs #157355 (Addor_try_*variants forHashMapandBTreeMapEntry APIs)dyn + dyn#157577 (Fix parser error recovery treating 'dyn' as a strict keyword in Rust 2015 when used indyn + dyn)errors.rsfile todiagnostics.rs(4/N) #157670 (Renameerrors.rsfile todiagnostics.rs(4/N))errors.rsfile todiagnostics.rs(5/N) #157700 (Renameerrors.rsfile todiagnostics.rs(5/N))Failed merges:
r? @ghost
Create a similar rollup