Skip to content

Commit

Permalink
Rollup merge of #68143 - skinny121:const-param-type-elided-lifetime, …
Browse files Browse the repository at this point in the history
…r=petrochenkov

Forbid elided lifetimes within const generic parameter types

Disallows `fn foo<const T: &u32>()`, the lifetime must be explicitly given, i.e. `fn foo<const T: &'static u32>()`.

Fixes #67883
  • Loading branch information
JohnTitor authored Jan 14, 2020
2 parents 7da1dcc + 82b90bd commit d7e5992
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/librustc_ast_lowering/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2120,12 +2120,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {

(hir::ParamName::Plain(param.ident), kind)
}
GenericParamKind::Const { ref ty } => (
hir::ParamName::Plain(param.ident),
hir::GenericParamKind::Const {
ty: self.lower_ty(&ty, ImplTraitContext::disallowed()),
},
),
GenericParamKind::Const { ref ty } => {
let ty = self
.with_anonymous_lifetime_mode(AnonymousLifetimeMode::ReportError, |this| {
this.lower_ty(&ty, ImplTraitContext::disallowed())
});

(hir::ParamName::Plain(param.ident), hir::GenericParamKind::Const { ty })
}
};

hir::GenericParam {
Expand Down
24 changes: 24 additions & 0 deletions src/test/ui/const-generics/const-param-elided-lifetime.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Elided lifetimes within the type of a const generic parameters is disallowed. This matches the
// behaviour of trait bounds where `fn foo<T: Ord<&u8>>() {}` is illegal. Though we could change
// elided lifetimes within the type of a const generic parameters to be 'static, like elided
// lifetimes within const/static items.

#![feature(const_generics)]
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash

struct A<const N: &u8>;
//~^ ERROR `&` without an explicit lifetime name cannot be used here
trait B {}

impl<const N: &u8> A<N> { //~ ERROR `&` without an explicit lifetime name cannot be used here
fn foo<const M: &u8>(&self) {}
//~^ ERROR `&` without an explicit lifetime name cannot be used here
}

impl<const N: &u8> B for A<N> {}
//~^ ERROR `&` without an explicit lifetime name cannot be used here

fn bar<const N: &u8>() {}
//~^ ERROR `&` without an explicit lifetime name cannot be used here

fn main() {}
40 changes: 40 additions & 0 deletions src/test/ui/const-generics/const-param-elided-lifetime.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
error[E0637]: `&` without an explicit lifetime name cannot be used here
--> $DIR/const-param-elided-lifetime.rs:9:19
|
LL | struct A<const N: &u8>;
| ^ explicit lifetime name needed here

error[E0637]: `&` without an explicit lifetime name cannot be used here
--> $DIR/const-param-elided-lifetime.rs:13:15
|
LL | impl<const N: &u8> A<N> {
| ^ explicit lifetime name needed here

error[E0637]: `&` without an explicit lifetime name cannot be used here
--> $DIR/const-param-elided-lifetime.rs:14:21
|
LL | fn foo<const M: &u8>(&self) {}
| ^ explicit lifetime name needed here

error[E0637]: `&` without an explicit lifetime name cannot be used here
--> $DIR/const-param-elided-lifetime.rs:18:15
|
LL | impl<const N: &u8> B for A<N> {}
| ^ explicit lifetime name needed here

error[E0637]: `&` without an explicit lifetime name cannot be used here
--> $DIR/const-param-elided-lifetime.rs:21:17
|
LL | fn bar<const N: &u8>() {}
| ^ explicit lifetime name needed here

warning: the feature `const_generics` is incomplete and may cause the compiler to crash
--> $DIR/const-param-elided-lifetime.rs:6:12
|
LL | #![feature(const_generics)]
| ^^^^^^^^^^^^^^
|
= note: `#[warn(incomplete_features)]` on by default

error: aborting due to 5 previous errors

0 comments on commit d7e5992

Please sign in to comment.