bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fmt

Browse source
This commit is contained in:
Ellen 2021-08-07 20:55:37 +01:00
parent d777cb84e2
commit 5f61271e38
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,9 +192,9 @@ pub(super) fn opt_const_param_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Option<
let res = segment.res.filter(|&r| r != Res::Err).unwrap_or(path.res); let res = segment.res.filter(|&r| r != Res::Err).unwrap_or(path.res);
use def::CtorOf; use def::CtorOf;
let generics = match res { let generics = match res {
Res::Def(DefKind::Ctor(CtorOf::Variant, _), def_id) => { Res::Def(DefKind::Ctor(CtorOf::Variant, _), def_id) => tcx.generics_of(
tcx.generics_of(tcx.parent(def_id).and_then(|def_id| tcx.parent(def_id)).unwrap()) tcx.parent(def_id).and_then(|def_id| tcx.parent(def_id)).unwrap(),
} ),
Res::Def(DefKind::Variant | DefKind::Ctor(CtorOf::Struct, _), def_id) => { Res::Def(DefKind::Variant | DefKind::Ctor(CtorOf::Struct, _), def_id) => {
tcx.generics_of(tcx.parent(def_id).unwrap()) tcx.generics_of(tcx.parent(def_id).unwrap())
} }

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

@ -1,5 +1,5 @@
// check-pass // check-pass
pub enum Foo<const N: usize> { enum Foo<const N: usize> {
Variant, Variant,
Variant2(), Variant2(),
Variant3{}, Variant3{},