Skip to content

Commit

Permalink
Revert the effect of #77467 by disabling normalization in rustdoc
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Nov 27, 2020
1 parent 361543d commit 8b81bb8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/librustdoc/clean/mod.rs
Expand Up @@ -1503,7 +1503,9 @@ impl Clean<Type> for hir::Ty<'_> {
}

/// Returns `None` if the type could not be normalized
#[allow(unreachable_code, unused_variables)]
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::traits::query::normalize::AtExt;
use rustc_middle::traits::ObligationCause;
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc/normalize-assoc-item.rs
@@ -1,6 +1,7 @@
// ignore-tidy-linelength
// aux-build:normalize-assoc-item.rs
// build-aux-docs
// ignore-test

pub trait Trait {
type X;
Expand Down

0 comments on commit 8b81bb8

Please sign in to comment.