diff options
| author | oli <github35764891676564198441@oli-obk.de> | 2020-11-27 17:08:49 +0000 |
|---|---|---|
| committer | oli <github35764891676564198441@oli-obk.de> | 2020-11-27 17:08:49 +0000 |
| commit | 8b81bb87155360092de8d7ad1e658b5e59d9aa09 (patch) | |
| tree | 0d3e64e798791fc50568fd6d234228f1cb7d98db | |
| parent | 361543d776d832b42f022f5b3aa1ab77263bc4a9 (diff) | |
| download | rust-8b81bb87155360092de8d7ad1e658b5e59d9aa09.tar.gz rust-8b81bb87155360092de8d7ad1e658b5e59d9aa09.zip | |
Revert the effect of #77467 by disabling normalization in rustdoc
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/normalize-assoc-item.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index ea34085823f..5c9ac3c4f6f 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -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; diff --git a/src/test/rustdoc/normalize-assoc-item.rs b/src/test/rustdoc/normalize-assoc-item.rs index 137fd354a87..70b3c66fd2b 100644 --- a/src/test/rustdoc/normalize-assoc-item.rs +++ b/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; |
