Rollup of 21 pull requests - #160678
Closed
JonathanBrouwer wants to merge 111 commits into
Closed
Conversation
Proving `T::Assoc<_>: Sized` while a where-clause bound `T::Assoc<u8>: Sized` was in scope used to over-eagerly infer the unconstrained argument to `u8`, causing a spurious "mismatched types" error. It should compile; lock that in.
Add tests for generic function pointers Change FnPtr tests to use assert_eq!() rather than println!()
don't force intrinsic results into memory
This updates the rust-version file to 7218ebe.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@7218ebe Filtered ref: rust-lang/miri@1b56e03 Upstream diff: rust-lang/rust@73dc916...7218ebe This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
Move command-result printing into a helper and keep CLI loop control at the call site.
Consume Priroda's --dap flag before handing arguments to rustc_driver::run_compiler, then dispatch the freshly-created PrirodaContext to either the existing CLI loop or a new DAP loop stub.
Add FirstUserSourceLocation ResumeMode variant that stops when the interpreter reaches a user-relevant frame with a source location. This gives the DAP frontend an entry-stop primitive that skips Miri-internal and std frames.
derive(Diagnostic): link to proper docs I confirmed that this makes the doc comment show up in RA when hovering a `derive(Diagnostic)`. Also it's not correct that `note` etc can only be used on the struct, those attributes also work on (some) fields. So also fix the comment.
Clean up some manual debug impls
Some of these can just be derives. Others omitted fields, deliberately or not.
For example, the annotate emitter debug now looks like:
```rust
AnnotateSnippetEmitter {
dst: <writer@0x9069b55c60>,
sm: Some(
SourceMap {
files: RwLock(
RwLock {
data: [
"C:\\Users\\bruno\\Rust\\rust\\tests\\ui\\consts\\bad-array-size-in-type-err.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\lib.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\../../core/src/attribute_docs.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\../../core/src/keyword_docs.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\../../core/src/primitive_docs.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\macros.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\thread\\local.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\prelude\\mod.rs",
"/rustc/FAKE_PREFIX\\library\\std\\src\\prelude\\v1.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\lib.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\clone.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\marker.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\default.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\cmp.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\ops\\mod.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\ops\\drop.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\ops\\function.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\ops\\async_function.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\convert\\mod.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\iter\\mod.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\iter\\traits\\mod.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\iter\\traits\\double_ended.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\iter\\traits\\exact_size.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\iter\\traits\\collect.rs",
"/rustc/FAKE_PREFIX\\library\\core\\src\\iter\\traits\\iterator.rs",
"/rustc/FAKE_PREFIX\\library\\alloc\\src\\lib.rs",
"/rustc/FAKE_PREFIX\\library\\alloc\\src\\borrow.rs",
"/rustc/FAKE_PREFIX\\library\\alloc\\src\\string.rs",
],
},
),
file_loader: <file_loader@0x1f813386448>,
path_mapping: FilePathMapping {
mapping: [],
filename_remapping_scopes: RemapPathScopeComponents(
MACRO | DIAGNOSTICS | DEBUGINFO | COVERAGE | DOCUMENTATION,
),
},
working_dir: RealFileName {
local: Some(
InnerRealFileName {
name: "C:\\Users\\bruno\\Rust\\rust",
working_directory: "",
embeddable_name: "C:\\Users\\bruno\\Rust\\rust",
},
),
maybe_remapped: InnerRealFileName {
name: "C:\\Users\\bruno\\Rust\\rust",
working_directory: "",
embeddable_name: "C:\\Users\\bruno\\Rust\\rust",
},
scopes: RemapPathScopeComponents(
0x0,
),
},
hash_kind: Sha256,
checksum_hash_kind: None,
},
),
short_message: false,
ui_testing: true,
ignored_directories_in_source_blocks: [
"C:\\Users\\bruno\\.cargo",
"C:\\Users\\bruno\\Rust\\rust\\vendor",
],
diagnostic_width: None,
macro_backtrace: false,
track_diagnostics: false,
terminal_url: No,
theme: Ascii,
}
```
…chenyukang move naked function ui tests Simply reorganizes some tests. - [x] I did not use an LLM to create a change in this PR. - [ ] I used an LLM to create a change in this PR, and I have explained below how it was used.
rustbot
added
A-attributes
Contributor
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
Aug 7, 2026
Rollup of 21 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple-* try-job: x86_64-mingw-1 try-job: i686-msvc-*
Contributor
|
⌛ Testing commit 31fea29 with merge 7702064... Workflow: https://github.com/rust-lang/rust/actions/runs/31164173562 |
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 7, 2026
…uwer Rollup of 21 pull requests Successful merges: - #159784 (Hint that memchr returns an in-bounds index) - #150885 (Revive L4Re target) - #159643 (Add support for splatted function pointers) - #160433 (delegation: add support for wrapping of the return value with `From::from`) - #160530 (refactor handling of target features in Session) - #160606 (bootstrap: Store and use an explicit CheckKind in `check::Rustc`) - #160628 (fix ICE in `suggest_add_reference_to_arg` for non-callable items) - #160634 (miri subtree update) - #157641 (Do not promote extern statics) - #158904 (Fix FutureDropPoll shim for by-move async closures) - #160103 (Add regression test for GAT bound mismatched type error) - #160335 (dlopen offload) - #160445 (codegen: classify localized MSVC linker progress as linker_info) - #160499 (rustc_resolve: move diagnostic attribute linting to attr parsing) - #160504 (cleanup borrowck, improve c-variadic handling) - #160577 (expand: Feature gate AST-based attribute macros on expressions and statements) - #160587 (Add regression test for associated type outlives bound at call site) - #160625 (platform-support/netbsd.md: No longer mention 8.x, due to EoL.) - #160636 (derive(Diagnostic): link to proper docs) - #160644 (Clean up some manual debug impls) - #160649 (move naked function ui tests)
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot)Important For more information how to resolve CI failures of this job, visit this link. |
2 tasks
rust-bors
Bot
added
S-waiting-on-author
Contributor
|
PR #160649, 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
Contributor
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:
From::from#160433 (delegation: add support for wrapping of the return value withFrom::from)check::Rustc#160606 (bootstrap: Store and use an explicit CheckKind incheck::Rustc)suggest_add_reference_to_argfor non-callable items #160628 (fix ICE insuggest_add_reference_to_argfor non-callable items)r? @ghost
Create a similar rollup