Skip to content

Commit bf0766a

Browse files
committed
rustdoc: fix fallout of ty::t -> Ty<'tcx>.
1 parent 8accc7c commit bf0766a

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
@@ -478,7 +478,7 @@ impl Clean<TyParam> for ast::TyParam {
478478
}
479479
}
480480

481-
impl Clean<TyParam> for ty::TypeParameterDef {
481+
impl<'tcx> Clean<TyParam> for ty::TypeParameterDef<'tcx> {
482482
fn clean(&self, cx: &DocContext) -> TyParam {
483483
cx.external_typarams.borrow_mut().as_mut().unwrap()
484484
.insert(self.def_id, self.name.clean(cx));
@@ -567,7 +567,7 @@ impl Clean<TyParamBound> for ty::BuiltinBound {
567567
}
568568
}
569569

570-
impl Clean<TyParamBound> for ty::TraitRef {
570+
impl<'tcx> Clean<TyParamBound> for ty::TraitRef<'tcx> {
571571
fn clean(&self, cx: &DocContext) -> TyParamBound {
572572
let tcx = match cx.tcx_opt() {
573573
Some(tcx) => tcx,
@@ -588,7 +588,7 @@ impl Clean<TyParamBound> for ty::TraitRef {
588588
}
589589
}
590590

591-
impl Clean<Vec<TyParamBound>> for ty::ParamBounds {
591+
impl<'tcx> Clean<Vec<TyParamBound>> for ty::ParamBounds<'tcx> {
592592
fn clean(&self, cx: &DocContext) -> Vec<TyParamBound> {
593593
let mut v = Vec::new();
594594
for b in self.builtin_bounds.iter() {
@@ -606,7 +606,7 @@ impl Clean<Vec<TyParamBound>> for ty::ParamBounds {
606606
}
607607
}
608608

609-
impl Clean<Option<Vec<TyParamBound>>> for subst::Substs {
609+
impl<'tcx> Clean<Option<Vec<TyParamBound>>> for subst::Substs<'tcx> {
610610
fn clean(&self, cx: &DocContext) -> Option<Vec<TyParamBound>> {
611611
let mut v = Vec::new();
612612
v.extend(self.regions().iter().filter_map(|r| r.clean(cx)).map(RegionBound));
@@ -698,7 +698,7 @@ impl Clean<Generics> for ast::Generics {
698698
}
699699
}
700700

701-
impl<'a> Clean<Generics> for (&'a ty::Generics, subst::ParamSpace) {
701+
impl<'a, 'tcx> Clean<Generics> for (&'a ty::Generics<'tcx>, subst::ParamSpace) {
702702
fn clean(&self, cx: &DocContext) -> Generics {
703703
let (me, space) = *self;
704704
Generics {
@@ -877,7 +877,7 @@ impl Clean<FnDecl> for ast::FnDecl {
877877
}
878878
}
879879

880-
impl<'a> Clean<Type> for ty::FnOutput {
880+
impl<'tcx> Clean<Type> for ty::FnOutput<'tcx> {
881881
fn clean(&self, cx: &DocContext) -> Type {
882882
match *self {
883883
ty::FnConverging(ty) => ty.clean(cx),
@@ -886,7 +886,7 @@ impl<'a> Clean<Type> for ty::FnOutput {
886886
}
887887
}
888888

889-
impl<'a> Clean<FnDecl> for (ast::DefId, &'a ty::FnSig) {
889+
impl<'a, 'tcx> Clean<FnDecl> for (ast::DefId, &'a ty::FnSig<'tcx>) {
890890
fn clean(&self, cx: &DocContext) -> FnDecl {
891891
let (did, sig) = *self;
892892
let mut names = if did.node != 0 {
@@ -1036,7 +1036,7 @@ impl Clean<ImplMethod> for ast::ImplItem {
10361036
}
10371037
}
10381038

1039-
impl Clean<Item> for ty::Method {
1039+
impl<'tcx> Clean<Item> for ty::Method<'tcx> {
10401040
fn clean(&self, cx: &DocContext) -> Item {
10411041
let (self_, sig) = match self.explicit_self {
10421042
ty::StaticExplicitSelfCategory => (ast::SelfStatic.clean(cx),
@@ -1082,7 +1082,7 @@ impl Clean<Item> for ty::Method {
10821082
}
10831083
}
10841084

1085-
impl Clean<Item> for ty::ImplOrTraitItem {
1085+
impl<'tcx> Clean<Item> for ty::ImplOrTraitItem<'tcx> {
10861086
fn clean(&self, cx: &DocContext) -> Item {
10871087
match *self {
10881088
ty::MethodTraitItem(ref mti) => mti.clean(cx),
@@ -1257,7 +1257,7 @@ impl Clean<Type> for ast::Ty {
12571257
}
12581258
}
12591259

1260-
impl Clean<Type> for Ty {
1260+
impl<'tcx> Clean<Type> for ty::Ty<'tcx> {
12611261
fn clean(&self, cx: &DocContext) -> Type {
12621262
match self.sty {
12631263
ty::ty_bool => Primitive(Bool),
@@ -1506,7 +1506,7 @@ impl Clean<Item> for doctree::Variant {
15061506
}
15071507
}
15081508

1509-
impl Clean<Item> for ty::VariantInfo {
1509+
impl<'tcx> Clean<Item> for ty::VariantInfo<'tcx> {
15101510
fn clean(&self, cx: &DocContext) -> Item {
15111511
// use syntax::parse::token::special_idents::unnamed_field;
15121512
let kind = match self.arg_names.as_ref().map(|s| s.as_slice()) {
@@ -2255,7 +2255,7 @@ impl Clean<Item> for ast::Typedef {
22552255
}
22562256

22572257
fn lang_struct(cx: &DocContext, did: Option<ast::DefId>,
2258-
t: Ty, name: &str,
2258+
t: ty::Ty, name: &str,
22592259
fallback: fn(Box<Type>) -> Type) -> Type {
22602260
let did = match did {
22612261
Some(did) => did,

0 commit comments

Comments
 (0)