bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert the effect of #77467 by disabling normalization in rustdoc

Browse source
This commit is contained in:
oli 2020-11-27 17:08:49 +00:00
parent 361543d776
commit 8b81bb8715
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/clean/mod.rs
View file

@ -1503,7 +1503,9 @@ impl Clean<Type> for hir::Ty<'_> {
} }
/// Returns `None` if the type could not be normalized /// Returns `None` if the type could not be normalized
#[allow(unreachable_code, unused_variables)]
fn normalize(cx: &DocContext<'tcx>, ty: Ty<'_>) -> Option<Ty<'tcx>> { fn normalize(cx: &DocContext<'tcx>, ty: Ty<'_>) -> Option<Ty<'tcx>> {
return None; // HACK: low-churn fix for #79459 while we wait for a trait normalization fix
use crate::rustc_trait_selection::infer::TyCtxtInferExt; use crate::rustc_trait_selection::infer::TyCtxtInferExt;
use crate::rustc_trait_selection::traits::query::normalize::AtExt; use crate::rustc_trait_selection::traits::query::normalize::AtExt;
use rustc_middle::traits::ObligationCause; use rustc_middle::traits::ObligationCause;

1
src/test/rustdoc/normalize-assoc-item.rs
View file

@ -1,6 +1,7 @@
// ignore-tidy-linelength // ignore-tidy-linelength
// aux-build:normalize-assoc-item.rs // aux-build:normalize-assoc-item.rs
// build-aux-docs // build-aux-docs
// ignore-test
pub trait Trait { pub trait Trait {
type X; type X;