Skip to content

Commit f58aad6

Browse files
committed
rustdoc: fix fallout of ty::t -> Ty<'tcx>.
1 parent 51960ad commit f58aad6

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/librustdoc/clean/mod.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ impl Clean<TyParam> for ast::TyParam {
460460
}
461461
}
462462

463-
impl Clean<TyParam> for ty::TypeParameterDef {
463+
impl<'tcx> Clean<TyParam> for ty::TypeParameterDef<'tcx> {
464464
fn clean(&self, cx: &DocContext) -> TyParam {
465465
cx.external_typarams.borrow_mut().as_mut().unwrap()
466466
.insert(self.def_id, self.name.clean(cx));
@@ -551,7 +551,7 @@ impl Clean<TyParamBound> for ty::BuiltinBound {
551551
}
552552
}
553553

554-
impl Clean<TyParamBound> for ty::TraitRef {
554+
impl<'tcx> Clean<TyParamBound> for ty::TraitRef<'tcx> {
555555
fn clean(&self, cx: &DocContext) -> TyParamBound {
556556
let tcx = match cx.tcx_opt() {
557557
Some(tcx) => tcx,
@@ -572,7 +572,7 @@ impl Clean<TyParamBound> for ty::TraitRef {
572572
}
573573
}
574574

575-
impl Clean<Vec<TyParamBound>> for ty::ParamBounds {
575+
impl<'tcx> Clean<Vec<TyParamBound>> for ty::ParamBounds<'tcx> {
576576
fn clean(&self, cx: &DocContext) -> Vec<TyParamBound> {
577577
let mut v = Vec::new();
578578
for b in self.builtin_bounds.iter() {
@@ -590,7 +590,7 @@ impl Clean<Vec<TyParamBound>> for ty::ParamBounds {
590590
}
591591
}
592592

593-
impl Clean<Option<Vec<TyParamBound>>> for subst::Substs {
593+
impl<'tcx> Clean<Option<Vec<TyParamBound>>> for subst::Substs<'tcx> {
594594
fn clean(&self, cx: &DocContext) -> Option<Vec<TyParamBound>> {
595595
let mut v = Vec::new();
596596
v.extend(self.regions().iter().filter_map(|r| r.clean(cx)).map(RegionBound));
@@ -697,7 +697,7 @@ impl Clean<Generics> for ast::Generics {
697697
}
698698
}
699699

700-
impl<'a> Clean<Generics> for (&'a ty::Generics, subst::ParamSpace) {
700+
impl<'a, 'tcx> Clean<Generics> for (&'a ty::Generics<'tcx>, subst::ParamSpace) {
701701
fn clean(&self, cx: &DocContext) -> Generics {
702702
let (me, space) = *self;
703703
Generics {
@@ -880,7 +880,7 @@ impl Clean<FnDecl> for ast::FnDecl {
880880
}
881881
}
882882

883-
impl<'a> Clean<Type> for ty::FnOutput {
883+
impl<'tcx> Clean<Type> for ty::FnOutput<'tcx> {
884884
fn clean(&self, cx: &DocContext) -> Type {
885885
match *self {
886886
ty::FnConverging(ty) => ty.clean(cx),
@@ -889,7 +889,7 @@ impl<'a> Clean<Type> for ty::FnOutput {
889889
}
890890
}
891891

892-
impl<'a> Clean<FnDecl> for (ast::DefId, &'a ty::FnSig) {
892+
impl<'a, 'tcx> Clean<FnDecl> for (ast::DefId, &'a ty::FnSig<'tcx>) {
893893
fn clean(&self, cx: &DocContext) -> FnDecl {
894894
let (did, sig) = *self;
895895
let mut names = if did.node != 0 {
@@ -1034,7 +1034,7 @@ impl Clean<ImplMethod> for ast::ImplItem {
10341034
}
10351035
}
10361036

1037-
impl Clean<Item> for ty::Method {
1037+
impl<'tcx> Clean<Item> for ty::Method<'tcx> {
10381038
fn clean(&self, cx: &DocContext) -> Item {
10391039
let (self_, sig) = match self.explicit_self {
10401040
ty::StaticExplicitSelfCategory => (ast::SelfStatic.clean(cx),
@@ -1080,7 +1080,7 @@ impl Clean<Item> for ty::Method {
10801080
}
10811081
}
10821082

1083-
impl Clean<Item> for ty::ImplOrTraitItem {
1083+
impl<'tcx> Clean<Item> for ty::ImplOrTraitItem<'tcx> {
10841084
fn clean(&self, cx: &DocContext) -> Item {
10851085
match *self {
10861086
ty::MethodTraitItem(ref mti) => mti.clean(cx),
@@ -1264,7 +1264,7 @@ impl Clean<Type> for ast::Ty {
12641264
}
12651265
}
12661266

1267-
impl Clean<Type> for ty::t {
1267+
impl<'tcx> Clean<Type> for ty::Ty<'tcx> {
12681268
fn clean(&self, cx: &DocContext) -> Type {
12691269
match self.sty {
12701270
ty::ty_nil => Primitive(Unit),
@@ -1513,7 +1513,7 @@ impl Clean<Item> for doctree::Variant {
15131513
}
15141514
}
15151515

1516-
impl Clean<Item> for ty::VariantInfo {
1516+
impl<'tcx> Clean<Item> for ty::VariantInfo<'tcx> {
15171517
fn clean(&self, cx: &DocContext) -> Item {
15181518
// use syntax::parse::token::special_idents::unnamed_field;
15191519
let kind = match self.arg_names.as_ref().map(|s| s.as_slice()) {
@@ -2250,7 +2250,7 @@ impl Clean<Item> for ast::Typedef {
22502250
}
22512251

22522252
fn lang_struct(cx: &DocContext, did: Option<ast::DefId>,
2253-
t: ty::t, name: &str,
2253+
t: ty::Ty, name: &str,
22542254
fallback: fn(Box<Type>) -> Type) -> Type {
22552255
let did = match did {
22562256
Some(did) => did,

0 commit comments

Comments
 (0)