Skip to content

Commit 64033a4

Browse files
committedJun 14, 2025·
Auto merge of #142483 - workingjubilee:rollup-8qnhueh, r=workingjubilee
Rollup of 16 pull requests Successful merges: - #140969 (Allow initializing logger with additional tracing Layer) - #141352 (builtin dyn impl no guide inference) - #142046 (add Vec::peek_mut) - #142273 (tests: Minicore `extern "gpu-kernel"` feature test) - #142302 (Rework how the disallowed qualifier in function type diagnostics are generated) - #142405 (Don't hardcode the intrinsic return types twice in the compiler) - #142434 ( Pre-install JS dependencies in tidy Dockerfile) - #142439 (doc: mention that intrinsics should not be called in user code) - #142441 (Delay replacing escaping bound vars in `FindParamInClause`) - #142449 (Require generic params for const generic params) - #142452 (Remove "intermittent" wording from `ReadDir`) - #142459 (Remove output helper bootstrap) - #142460 (cleanup search graph impl) - #142461 (compiletest: Clarify that `--no-capture` is needed with `--verbose`) - #142475 (Add platform support docs & maintainers for *-windows-msvc) - #142480 (tests: Convert two handwritten minicores to add-core-stubs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 64c81fd + 572b452 commit 64033a4

File tree

71 files changed

+1268
-614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1268
-614
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4618,7 +4618,7 @@ dependencies = [
46184618
"derive-where",
46194619
"ena",
46204620
"indexmap",
4621-
"rustc-hash 1.1.0",
4621+
"rustc-hash 2.1.1",
46224622
"rustc_ast_ir",
46234623
"rustc_data_structures",
46244624
"rustc_index",

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,7 +2147,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
21472147
ty_id,
21482148
&None,
21492149
path,
2150-
ParamMode::Optional,
2150+
ParamMode::Explicit,
21512151
AllowReturnTypeNotation::No,
21522152
// FIXME(mgca): update for `fn foo() -> Bar<FOO<impl Trait>>` support
21532153
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
@@ -2219,7 +2219,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
22192219
expr.id,
22202220
qself,
22212221
path,
2222-
ParamMode::Optional,
2222+
ParamMode::Explicit,
22232223
AllowReturnTypeNotation::No,
22242224
// FIXME(mgca): update for `fn foo() -> Bar<FOO<impl Trait>>` support
22252225
ImplTraitContext::Disallowed(ImplTraitPosition::Path),

0 commit comments

Comments
 (0)
Please sign in to comment.