Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 139fb22

Browse files
committedJan 3, 2024
Auto merge of rust-lang#119549 - fmease:rollup-jxvbfes, r=fmease
Rollup of 21 pull requests Successful merges: - rust-lang#119086 (Query panic!() to useful diagnostic) - rust-lang#119239 (Remove unnecessary arm in `check_expr_yield`) - rust-lang#119298 (suppress change-tracker warnings in CI containers) - rust-lang#119319 (Document that File does not buffer reads/writes) - rust-lang#119434 (rc: Take *const T in is_dangling) - rust-lang#119444 (Rename `TyCtxt::is_closure` to `TyCtxt::is_closure_or_coroutine`) - rust-lang#119474 (Update tracking issue of naked_functions) - rust-lang#119476 (Pretty-print always-const trait predicates correctly) - rust-lang#119477 (rustdoc ui: adjust tooltip z-index to be above sidebar) - rust-lang#119479 (Remove two unused feature gates from rustc_query_impl) - rust-lang#119487 (Minor improvements in comment on `freshen.rs`) - rust-lang#119492 (Update books) - rust-lang#119494 (Deny defaults for higher-ranked generic parameters) - rust-lang#119498 (Update deadlinks of `strict_provenance` lints) - rust-lang#119505 (Don't synthesize host effect params for trait associated functions marked const) - rust-lang#119510 (Report I/O errors from rmeta encoding with emit_fatal) - rust-lang#119512 (Mark myself as back from leave) - rust-lang#119514 (coverage: Avoid a query stability hazard in `function_coverage_map`) - rust-lang#119523 (llvm: Allow `noundef` in codegen tests) - rust-lang#119534 (Update `thread_local` examples to use `local_key_cell_methods`) - rust-lang#119544 (Fix: Properly set vendor in i686-win7-windows-msvc target) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1a47f5b + 9b2a44a commit 139fb22

File tree

77 files changed

+676
-285
lines changed

Some content is hidden

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

77 files changed

+676
-285
lines changed
 

‎compiler/rustc_ast_lowering/messages.ftl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ ast_lowering_closure_cannot_be_static = closures cannot be static
4545
ast_lowering_coroutine_too_many_parameters =
4646
too many parameters for a coroutine (expected 0 or 1 parameters)
4747
48-
ast_lowering_default_parameter_in_binder = default parameter is not allowed in this binder
49-
5048
ast_lowering_does_not_support_modifiers =
5149
the `{$class_name}` register class does not support template modifiers
5250
@@ -58,6 +56,9 @@ ast_lowering_functional_record_update_destructuring_assignment =
5856
functional record updates are not allowed in destructuring assignments
5957
.suggestion = consider removing the trailing pattern
6058
59+
ast_lowering_generic_param_default_in_binder =
60+
defaults for generic parameters are not allowed in `for<...>` binders
61+
6162
ast_lowering_generic_type_with_parentheses =
6263
parenthesized type parameters may only be used with a `Fn` trait
6364
.label = only `Fn` traits may use parentheses

‎compiler/rustc_ast_lowering/src/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,8 @@ pub enum BadReturnTypeNotation {
397397
}
398398

399399
#[derive(Diagnostic)]
400-
#[diag(ast_lowering_default_parameter_in_binder)]
401-
pub(crate) struct UnexpectedDefaultParameterInBinder {
400+
#[diag(ast_lowering_generic_param_default_in_binder)]
401+
pub(crate) struct GenericParamDefaultInBinder {
402402
#[primary_span]
403403
pub span: Span,
404404
}

0 commit comments

Comments
 (0)
Please sign in to comment.