提交 bf0766ad 编写于 作者: E Eduard Burtescu

rustdoc: fix fallout of ty::t -> Ty<'tcx>.

上级 8accc7c3
...@@ -478,7 +478,7 @@ fn clean(&self, cx: &DocContext) -> TyParam { ...@@ -478,7 +478,7 @@ fn clean(&self, cx: &DocContext) -> TyParam {
} }
} }
impl Clean<TyParam> for ty::TypeParameterDef { impl<'tcx> Clean<TyParam> for ty::TypeParameterDef<'tcx> {
fn clean(&self, cx: &DocContext) -> TyParam { fn clean(&self, cx: &DocContext) -> TyParam {
cx.external_typarams.borrow_mut().as_mut().unwrap() cx.external_typarams.borrow_mut().as_mut().unwrap()
.insert(self.def_id, self.name.clean(cx)); .insert(self.def_id, self.name.clean(cx));
...@@ -567,7 +567,7 @@ fn clean(&self, cx: &DocContext) -> TyParamBound { ...@@ -567,7 +567,7 @@ fn clean(&self, cx: &DocContext) -> TyParamBound {
} }
} }
impl Clean<TyParamBound> for ty::TraitRef { impl<'tcx> Clean<TyParamBound> for ty::TraitRef<'tcx> {
fn clean(&self, cx: &DocContext) -> TyParamBound { fn clean(&self, cx: &DocContext) -> TyParamBound {
let tcx = match cx.tcx_opt() { let tcx = match cx.tcx_opt() {
Some(tcx) => tcx, Some(tcx) => tcx,
...@@ -588,7 +588,7 @@ fn clean(&self, cx: &DocContext) -> TyParamBound { ...@@ -588,7 +588,7 @@ fn clean(&self, cx: &DocContext) -> TyParamBound {
} }
} }
impl Clean<Vec<TyParamBound>> for ty::ParamBounds { impl<'tcx> Clean<Vec<TyParamBound>> for ty::ParamBounds<'tcx> {
fn clean(&self, cx: &DocContext) -> Vec<TyParamBound> { fn clean(&self, cx: &DocContext) -> Vec<TyParamBound> {
let mut v = Vec::new(); let mut v = Vec::new();
for b in self.builtin_bounds.iter() { for b in self.builtin_bounds.iter() {
...@@ -606,7 +606,7 @@ fn clean(&self, cx: &DocContext) -> Vec<TyParamBound> { ...@@ -606,7 +606,7 @@ fn clean(&self, cx: &DocContext) -> Vec<TyParamBound> {
} }
} }
impl Clean<Option<Vec<TyParamBound>>> for subst::Substs { impl<'tcx> Clean<Option<Vec<TyParamBound>>> for subst::Substs<'tcx> {
fn clean(&self, cx: &DocContext) -> Option<Vec<TyParamBound>> { fn clean(&self, cx: &DocContext) -> Option<Vec<TyParamBound>> {
let mut v = Vec::new(); let mut v = Vec::new();
v.extend(self.regions().iter().filter_map(|r| r.clean(cx)).map(RegionBound)); v.extend(self.regions().iter().filter_map(|r| r.clean(cx)).map(RegionBound));
...@@ -698,7 +698,7 @@ fn clean(&self, cx: &DocContext) -> Generics { ...@@ -698,7 +698,7 @@ fn clean(&self, cx: &DocContext) -> Generics {
} }
} }
impl<'a> Clean<Generics> for (&'a ty::Generics, subst::ParamSpace) { impl<'a, 'tcx> Clean<Generics> for (&'a ty::Generics<'tcx>, subst::ParamSpace) {
fn clean(&self, cx: &DocContext) -> Generics { fn clean(&self, cx: &DocContext) -> Generics {
let (me, space) = *self; let (me, space) = *self;
Generics { Generics {
...@@ -877,7 +877,7 @@ fn clean(&self, cx: &DocContext) -> FnDecl { ...@@ -877,7 +877,7 @@ fn clean(&self, cx: &DocContext) -> FnDecl {
} }
} }
impl<'a> Clean<Type> for ty::FnOutput { impl<'tcx> Clean<Type> for ty::FnOutput<'tcx> {
fn clean(&self, cx: &DocContext) -> Type { fn clean(&self, cx: &DocContext) -> Type {
match *self { match *self {
ty::FnConverging(ty) => ty.clean(cx), ty::FnConverging(ty) => ty.clean(cx),
...@@ -886,7 +886,7 @@ fn clean(&self, cx: &DocContext) -> Type { ...@@ -886,7 +886,7 @@ fn clean(&self, cx: &DocContext) -> Type {
} }
} }
impl<'a> Clean<FnDecl> for (ast::DefId, &'a ty::FnSig) { impl<'a, 'tcx> Clean<FnDecl> for (ast::DefId, &'a ty::FnSig<'tcx>) {
fn clean(&self, cx: &DocContext) -> FnDecl { fn clean(&self, cx: &DocContext) -> FnDecl {
let (did, sig) = *self; let (did, sig) = *self;
let mut names = if did.node != 0 { let mut names = if did.node != 0 {
...@@ -1036,7 +1036,7 @@ fn clean(&self, cx: &DocContext) -> ImplMethod { ...@@ -1036,7 +1036,7 @@ fn clean(&self, cx: &DocContext) -> ImplMethod {
} }
} }
impl Clean<Item> for ty::Method { impl<'tcx> Clean<Item> for ty::Method<'tcx> {
fn clean(&self, cx: &DocContext) -> Item { fn clean(&self, cx: &DocContext) -> Item {
let (self_, sig) = match self.explicit_self { let (self_, sig) = match self.explicit_self {
ty::StaticExplicitSelfCategory => (ast::SelfStatic.clean(cx), ty::StaticExplicitSelfCategory => (ast::SelfStatic.clean(cx),
...@@ -1082,7 +1082,7 @@ fn clean(&self, cx: &DocContext) -> Item { ...@@ -1082,7 +1082,7 @@ fn clean(&self, cx: &DocContext) -> Item {
} }
} }
impl Clean<Item> for ty::ImplOrTraitItem { impl<'tcx> Clean<Item> for ty::ImplOrTraitItem<'tcx> {
fn clean(&self, cx: &DocContext) -> Item { fn clean(&self, cx: &DocContext) -> Item {
match *self { match *self {
ty::MethodTraitItem(ref mti) => mti.clean(cx), ty::MethodTraitItem(ref mti) => mti.clean(cx),
...@@ -1257,7 +1257,7 @@ fn clean(&self, cx: &DocContext) -> Type { ...@@ -1257,7 +1257,7 @@ fn clean(&self, cx: &DocContext) -> Type {
} }
} }
impl Clean<Type> for Ty { impl<'tcx> Clean<Type> for ty::Ty<'tcx> {
fn clean(&self, cx: &DocContext) -> Type { fn clean(&self, cx: &DocContext) -> Type {
match self.sty { match self.sty {
ty::ty_bool => Primitive(Bool), ty::ty_bool => Primitive(Bool),
...@@ -1506,7 +1506,7 @@ fn clean(&self, cx: &DocContext) -> Item { ...@@ -1506,7 +1506,7 @@ fn clean(&self, cx: &DocContext) -> Item {
} }
} }
impl Clean<Item> for ty::VariantInfo { impl<'tcx> Clean<Item> for ty::VariantInfo<'tcx> {
fn clean(&self, cx: &DocContext) -> Item { fn clean(&self, cx: &DocContext) -> Item {
// use syntax::parse::token::special_idents::unnamed_field; // use syntax::parse::token::special_idents::unnamed_field;
let kind = match self.arg_names.as_ref().map(|s| s.as_slice()) { let kind = match self.arg_names.as_ref().map(|s| s.as_slice()) {
...@@ -2255,7 +2255,7 @@ fn clean(&self, cx: &DocContext) -> Item { ...@@ -2255,7 +2255,7 @@ fn clean(&self, cx: &DocContext) -> Item {
} }
fn lang_struct(cx: &DocContext, did: Option<ast::DefId>, fn lang_struct(cx: &DocContext, did: Option<ast::DefId>,
t: Ty, name: &str, t: ty::Ty, name: &str,
fallback: fn(Box<Type>) -> Type) -> Type { fallback: fn(Box<Type>) -> Type) -> Type {
let did = match did { let did = match did {
Some(did) => did, Some(did) => did,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册