Skip to content

Commit 650d9d3

Browse files
committed
Auto merge of rust-lang#79469 - rust-lang:revert-77467-query-docs, r=jyn514
Revert "Normalize `<X as Y>::T` for rustdoc" Reverts rust-lang#77467 by disabling normalization. See rust-lang#79459; I intend to reland normalization once that's fixed. r? `@Aaron1011` cc `@oli-obk` `@GuillaumeGomez`
2 parents fd6b537 + 8b81bb8 commit 650d9d3

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

src/librustdoc/clean/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,9 @@ impl Clean<Type> for hir::Ty<'_> {
15031503
}
15041504

15051505
/// Returns `None` if the type could not be normalized
1506+
#[allow(unreachable_code, unused_variables)]
15061507
fn normalize(cx: &DocContext<'tcx>, ty: Ty<'_>) -> Option<Ty<'tcx>> {
1508+
return None; // HACK: low-churn fix for #79459 while we wait for a trait normalization fix
15071509
use crate::rustc_trait_selection::infer::TyCtxtInferExt;
15081510
use crate::rustc_trait_selection::traits::query::normalize::AtExt;
15091511
use rustc_middle::traits::ObligationCause;

src/test/rustdoc/normalize-assoc-item.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ignore-tidy-linelength
22
// aux-build:normalize-assoc-item.rs
33
// build-aux-docs
4+
// ignore-test
45

56
pub trait Trait {
67
type X;

0 commit comments

Comments
 (0)