Rollup of 18 pull requests - #163089
Closed
JonathanBrouwer wants to merge 50 commits into
Closed
Rollup of 18 pull requests#163089JonathanBrouwer wants to merge 50 commits into
JonathanBrouwer wants to merge 50 commits into
Conversation
Co-authored-by: malezjaa <poreba.kris@gmail.com>
If rmeta encoding has to define these constants anyway, we might as well provide them as inherent constants and use them in `descr` too. In current versions of bitflags, flags can be combined in const contexts by calling `union` instead of using the overloaded `|` operator.
Instead of manually skipping it right before the remove_dir. This will be simpler once we stop immediately copying from the old incr comp dir. Previously this wasn't possible due to the usage of process-based fcntl locking, but I added proper fd-based locking recently.
```
error[E0308]: mismatched types
--> $DIR/ref-pat-suggestions.rs:29:13
|
LL | let &mut _a = 0;
| ^^^^^^^ - this expression has type `{integer}`
| |
| expected integer, found `&mut _`
|
= note: expected type `{integer}`
found mutable reference `&mut _`
help: to declare a mutable variable use
|
LL - let &mut _a = 0;
LL + let mut _a = 0;
|
```
- mention `-Zmacro-backtrace` only for non-local macros - include span for local macro encompassing error
Use same wording as cargo does when `package.edition` is unspecified. Do not suggest `--edition=future` on stable.
It's only used for `self.root_cx.root_def_id()`, but `self.infcx.root_def_id` is also available.
Duplicated items cause lots of confusing knock down errors. This change side-steps some known ICEs, and reduces the verbosity of crates with duplicated types at the cost of not emitting every error that we could.
Update tests that no longer crash:
120873 -> `tests/ui/resolve/multiple_definitions_attribute_merging.rs`
(already existing)
123690 -> `tests/ui/resolve/duplicated-enum-variant.rs`
155482 -> `tests/ui/resolve/duplicated-item-in-const-generics.rs`
Added two cases from the report that still ICE.
Commit c68d710, which introduced backward analyses, changed a label from `(on entry)` to `(on start)` but failed to update a few relevant places. This commit fixes that.
It's on the `impl` line and in the where clause.
…tgross35 enable `f128` from `u64`/`i64` test tracking issue: rust-lang#116909 Seems to just work now. r? tgross35
…, r=chenyukang Remove `TypeChecker::root_cx` It's only used for `self.root_cx.root_def_id()`, but `self.infcx.root_def_id` is also available. r? @lqd
rustbot
added
A-compiletest
Member
Author
Contributor
rust-bors
Bot
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Sep 21, 2026
Rollup of 18 pull requests try-job: dist-various-1 try-job: test-various try-job: test-x86_64-gnu-aux try-job: test-x86_64-gnu-llvm-21-3 try-job: test-x86_64-msvc-1 try-job: test-aarch64-apple-1 try-job: test-aarch64-apple-2 try-job: test-x86_64-mingw-1 try-job: test-i686-msvc try-job: test-armhf-gnu
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
⌛ Testing commit 2b32d64 with merge a9d2e94... Workflow: https://github.com/rust-lang/rust/actions/runs/35576725017 |
rust-bors Bot
pushed a commit
that referenced
this pull request
Sep 21, 2026
…uwer Rollup of 18 pull requests Successful merges: - #161051 (When error from local macro, include macro def span) - #161629 (Streamline `StateDiffCollector`) - #162750 (add case mapping fast paths for Latin-1) - #162831 (Do not continue past `rustc_resolve` when encountering duplicated items) - #162835 (rustdoc: account for nested parens and split text events in bare urls lint) - #162952 (Depend on lockfiles to prevent GC of the current session) - #163044 (Report runtime range endpoints for runtime values) - #163062 (Use x30 register name with LLVM 23+) - #158102 (When compiling without a specified `--edition`, emit a note) - #162939 (Declare multi-kind constants for MacroKinds) - #162984 (Windows: don't error if `access_mode` is set on `OpenOptions`) - #163005 (Avoid unreachable integer underflow check in `CStr::count_bytes()`) - #163019 (Prepare for the introduction of forced keywords (`k#`)) - #163020 (Dir: fix fallback impl for remove_dir) - #163047 (Use verbose suggestion for `mut binding` instead of `&mut binding`) - #163075 (Fix ArgAttributes mismatches in ABI UI tests for LoongArch64 and RiscV64) - #163079 (enable `f128` from `u64`/`i64` test) - #163082 (Remove `TypeChecker::root_cx`)
rust-bors
Bot
added
S-waiting-on-author
Contributor
|
PR #158102, which is a member of this rollup, was unapproved. This rollup was thus unapproved. Auto build was cancelled due to unapproval. Cancelled workflows: |
rustbot
removed
the
S-waiting-on-author
rust-bors
Bot
added
the
S-waiting-on-author
Contributor
|
💔 Test for 59642f0 failed: CI. Failed jobs:
|
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
17 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:
StateDiffCollector#161629 (StreamlineStateDiffCollector)rustc_resolvewhen encountering duplicated items #162831 (Do not continue pastrustc_resolvewhen encountering duplicated items)--edition, emit a note #158102 (When compiling without a specified--edition, emit a note)access_modeis set onOpenOptions#162984 (Windows: don't error ifaccess_modeis set onOpenOptions)CStr::count_bytes()#163005 (Avoid unreachable integer underflow check inCStr::count_bytes())k#) #163019 (Prepare for the introduction of forced keywords (k#))mut bindinginstead of&mut binding#163047 (Use verbose suggestion formut bindinginstead of&mut binding)f128fromu64/i64test #163079 (enablef128fromu64/i64test)TypeChecker::root_cx#163082 (RemoveTypeChecker::root_cx)r? @ghost
Create a similar rollup