Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fallback default to None during ast-lowering for lifetime binder #119042

Merged
merged 1 commit into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/rustc_ast_lowering/messages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ast_lowering_closure_cannot_be_static = closures cannot be static
ast_lowering_coroutine_too_many_parameters =
too many parameters for a coroutine (expected 0 or 1 parameters)

ast_lowering_default_parameter_in_binder = default parameter is not allowed in this binder

ast_lowering_does_not_support_modifiers =
the `{$class_name}` register class does not support template modifiers

Expand Down
7 changes: 7 additions & 0 deletions compiler/rustc_ast_lowering/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -395,3 +395,10 @@ pub enum BadReturnTypeNotation {
span: Span,
},
}

#[derive(Diagnostic)]
#[diag(ast_lowering_default_parameter_in_binder)]
pub(crate) struct UnexpectedDefaultParameterInBinder {
#[primary_span]
pub span: Span,
}
25 changes: 23 additions & 2 deletions compiler/rustc_ast_lowering/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#![allow(internal_features)]
#![feature(rustdoc_internals)]
#![doc(rust_logo)]
#![feature(if_let_guard)]
#![feature(box_patterns)]
#![feature(let_chains)]
#![recursion_limit = "256"]
Expand Down Expand Up @@ -65,6 +66,7 @@ use rustc_session::parse::{add_feature_diagnostics, feature_err};
use rustc_span::symbol::{kw, sym, Ident, Symbol};
use rustc_span::{DesugaringKind, Span, DUMMY_SP};
use smallvec::SmallVec;
use std::borrow::Cow;
use std::collections::hash_map::Entry;
use thin_vec::ThinVec;

Expand Down Expand Up @@ -878,8 +880,27 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
binder: NodeId,
generic_params: &[GenericParam],
) -> &'hir [hir::GenericParam<'hir>] {
let mut generic_params: Vec<_> = self
.lower_generic_params_mut(generic_params, hir::GenericParamSource::Binder)
let mut generic_params: Vec<_> = generic_params
.iter()
.map(|param| {
let param = match param.kind {
bvanjoi marked this conversation as resolved.
Show resolved Hide resolved
GenericParamKind::Type { ref default } if let Some(ty) = default => {
// Default type is not permitted in non-lifetime binders.
// So we emit an error and default to `None` to prevent
// potential ice.
self.dcx().emit_err(errors::UnexpectedDefaultParameterInBinder {
span: ty.span(),
});
let param = GenericParam {
kind: GenericParamKind::Type { default: None },
..param.clone()
bvanjoi marked this conversation as resolved.
Show resolved Hide resolved
};
Cow::Owned(param)
}
_ => Cow::Borrowed(param),
};
self.lower_generic_param(param.as_ref(), hir::GenericParamSource::Binder)
})
.collect();
let extra_lifetimes = self.resolver.take_extra_lifetime_params(binder);
debug!(?extra_lifetimes);
Expand Down
7 changes: 7 additions & 0 deletions tests/ui/parser/issue-119042.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// check-pass

macro_rules! a { ($ty:ty) => {} }

a! { for<T = &i32> fn() }

fn main() {}
9 changes: 9 additions & 0 deletions tests/ui/traits/non_lifetime_binders/issue-118697.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#![allow(incomplete_features)]
#![feature(non_lifetime_binders)]

type T = dyn for<V = A(&())> Fn(());
//~^ ERROR default parameter is not allowed in this binder
//~| ERROR cannot find type `A` in this scope
//~| ERROR late-bound type parameter not allowed on trait object types

fn main() {}
21 changes: 21 additions & 0 deletions tests/ui/traits/non_lifetime_binders/issue-118697.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
error[E0412]: cannot find type `A` in this scope
--> $DIR/issue-118697.rs:4:22
|
LL | type T = dyn for<V = A(&())> Fn(());
| ^ not found in this scope

error: default parameter is not allowed in this binder
--> $DIR/issue-118697.rs:4:22
|
LL | type T = dyn for<V = A(&())> Fn(());
| ^^^^^^

error: late-bound type parameter not allowed on trait object types
--> $DIR/issue-118697.rs:4:18
|
LL | type T = dyn for<V = A(&())> Fn(());
| ^

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0412`.