Skip to content

Commit 277bdbc

Browse files
committed
Remove redundant lift_to_tcx
... and fix some fuzzy wording in the debug logging.
1 parent 6278daa commit 277bdbc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/librustdoc/clean/mod.rs

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

15051505
/// Returns `None` if the type could not be normalized
1506-
fn normalize(cx: &DocContext<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'tcx>> {
1506+
fn normalize(cx: &DocContext<'tcx>, ty: Ty<'_>) -> Option<Ty<'tcx>> {
15071507
use crate::rustc_trait_selection::infer::TyCtxtInferExt;
15081508
use crate::rustc_trait_selection::traits::query::normalize::AtExt;
15091509
use rustc_middle::traits::ObligationCause;
@@ -1518,11 +1518,11 @@ fn normalize(cx: &DocContext<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'tcx>> {
15181518
});
15191519
match normalized {
15201520
Ok(normalized_value) => {
1521-
debug!("resolved {:?} to {:?}", ty, normalized_value);
1521+
debug!("normalized {:?} to {:?}", ty, normalized_value);
15221522
Some(normalized_value)
15231523
}
15241524
Err(err) => {
1525-
debug!("failed to resolve {:?}: {:?}", ty, err);
1525+
debug!("failed to normalize {:?}: {:?}", ty, err);
15261526
None
15271527
}
15281528
}
@@ -1531,7 +1531,7 @@ fn normalize(cx: &DocContext<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'tcx>> {
15311531
impl<'tcx> Clean<Type> for Ty<'tcx> {
15321532
fn clean(&self, cx: &DocContext<'_>) -> Type {
15331533
debug!("cleaning type: {:?}", self);
1534-
let ty = normalize(cx, self.lift_to_tcx(cx.tcx).unwrap()).unwrap_or(self);
1534+
let ty = normalize(cx, self).unwrap_or(self);
15351535
match *ty.kind() {
15361536
ty::Never => Never,
15371537
ty::Bool => Primitive(PrimitiveType::Bool),

0 commit comments

Comments
 (0)