bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

less opt in const param of

Browse source
This commit is contained in:
Ellen 2021-08-07 18:44:36 +01:00
parent 508b328c39
commit d777cb84e2
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_typeck/src/collect/type_of.rs
View file

@ -190,8 +190,12 @@ pub(super) fn opt_const_param_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Option<
// Try to use the segment resolution if it is valid, otherwise we
// default to the path resolution.
let res = segment.res.filter(|&r| r != Res::Err).unwrap_or(path.res);
use def::CtorOf;
let generics = match res {
Res::Def(DefKind::Ctor(..), def_id) => {
Res::Def(DefKind::Ctor(CtorOf::Variant, _), def_id) => {
tcx.generics_of(tcx.parent(def_id).and_then(|def_id| tcx.parent(def_id)).unwrap())
}
Res::Def(DefKind::Variant | DefKind::Ctor(CtorOf::Struct, _), def_id) => {
tcx.generics_of(tcx.parent(def_id).unwrap())
}
// Other `DefKind`s don't have generics and would ICE when calling
@ -200,7 +204,6 @@ pub(super) fn opt_const_param_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Option<
DefKind::Struct
| DefKind::Union
| DefKind::Enum
| DefKind::Variant
| DefKind::Trait
| DefKind::OpaqueTy
| DefKind::TyAlias

24
src/test/ui/const-generics/enum-variants.rs Normal file
View file

@ -0,0 +1,24 @@
// check-pass
pub enum Foo<const N: usize> {
Variant,
Variant2(),
Variant3{},
}
struct Bar<const N: usize>;
struct Bar2<const N: usize>();
struct Bar3<const N: usize> {}
fn main() {
let _ = Foo::Variant::<1>;
let _ = Foo::Variant2::<1>();
let _ = Foo::Variant3::<1>{};
let _ = Foo::<1>::Variant;
let _ = Foo::<1>::Variant2();
let _ = Foo::<1>::Variant3{};
let _ = Bar::<1>;
let _ = Bar2::<1>();
let _ = Bar3::<1>{};
}