mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use unnormalized type in Ty::fn_sig

Browse Source
This commit is contained in:
Michael Goulet 2022-10-09 07:52:15 +00:00
parent f382c2748a
commit 7dedb9192d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustdoc/clean/mod.rs
View File

@ -1582,12 +1582,12 @@ fn normalize<'tcx>(cx: &mut DocContext<'tcx>, ty: Ty<'_>) -> Option<Ty<'tcx>> {
} }
pub(crate) fn clean_middle_ty<'tcx>( pub(crate) fn clean_middle_ty<'tcx>(
this: Ty<'tcx>, ty: Ty<'tcx>,
cx: &mut DocContext<'tcx>, cx: &mut DocContext<'tcx>,
def_id: Option<DefId>, def_id: Option<DefId>,
) -> Type { ) -> Type {
trace!("cleaning type: {:?}", this); trace!("cleaning type: {:?}", ty);
let ty = normalize(cx, this).unwrap_or(this); let ty = normalize(cx, ty).unwrap_or(ty);
match *ty.kind() { match *ty.kind() {
ty::Never => Primitive(PrimitiveType::Never), ty::Never => Primitive(PrimitiveType::Never),
ty::Bool => Primitive(PrimitiveType::Bool), ty::Bool => Primitive(PrimitiveType::Bool),
@ -1610,7 +1610,6 @@ pub(crate) fn clean_middle_ty<'tcx>(
type_: Box::new(clean_middle_ty(ty, cx, None)), type_: Box::new(clean_middle_ty(ty, cx, None)),
}, },
ty::FnDef(..) | ty::FnPtr(_) => { ty::FnDef(..) | ty::FnPtr(_) => {
let ty = cx.tcx.lift(this).expect("FnPtr lift failed");
let sig = ty.fn_sig(cx.tcx); let sig = ty.fn_sig(cx.tcx);
let decl = clean_fn_decl_from_did_and_sig(cx, None, sig); let decl = clean_fn_decl_from_did_and_sig(cx, None, sig);
BareFunction(Box::new(BareFunctionDecl { BareFunction(Box::new(BareFunctionDecl {
@ -1644,7 +1643,7 @@ pub(crate) fn clean_middle_ty<'tcx>(
let did = obj let did = obj
.principal_def_id() .principal_def_id()
.or_else(|| dids.next()) .or_else(|| dids.next())
.unwrap_or_else(|| panic!("found trait object `{:?}` with no traits?", this)); .unwrap_or_else(|| panic!("found trait object `{:?}` with no traits?", ty));
let substs = match obj.principal() { let substs = match obj.principal() {
Some(principal) => principal.skip_binder().substs, Some(principal) => principal.skip_binder().substs,
// marker traits have no substs. // marker traits have no substs.

13
src/test/rustdoc/normalize-assoc-item.rs
View File

@ -11,11 +11,24 @@ impl Trait for usize {
type X = isize; type X = isize;
} }
impl Trait for () {
type X = fn() -> i32;
}
impl Trait for isize {
type X = <() as Trait>::X;
}
// @has 'normalize_assoc_item/fn.f.html' '//pre[@class="rust fn"]' 'pub fn f() -> isize' // @has 'normalize_assoc_item/fn.f.html' '//pre[@class="rust fn"]' 'pub fn f() -> isize'
pub fn f() -> <usize as Trait>::X { pub fn f() -> <usize as Trait>::X {
0 0
} }
// @has 'normalize_assoc_item/fn.f2.html' '//pre[@class="rust fn"]' 'pub fn f2() -> fn() -> i32'
pub fn f2() -> <isize as Trait>::X {
todo!()
}
pub struct S { pub struct S {
// @has 'normalize_assoc_item/struct.S.html' '//span[@id="structfield.box_me_up"]' 'box_me_up: Box<S, Global>' // @has 'normalize_assoc_item/struct.S.html' '//span[@id="structfield.box_me_up"]' 'box_me_up: Box<S, Global>'
pub box_me_up: <S as Trait>::X, pub box_me_up: <S as Trait>::X,