user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #11485 : eddyb/rust/sweep-old-rust, r=nikomatsakis

Browse source
This commit is contained in:
bors 2014-01-14 12:32:11 -08:00
commit 9075025c7b
39 changed files with 191 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/clean.rs
View file

@ -377,7 +377,7 @@ pub enum SelfTy {
SelfStatic,
SelfValue,
SelfBorrowed(Option<Lifetime>, Mutability),
SelfManaged(Mutability),
SelfManaged,
SelfOwned,
}
@ -388,7 +388,7 @@ impl Clean<SelfTy> for ast::ExplicitSelf {
ast::SelfValue(_) => SelfValue,
ast::SelfUniq(_) => SelfOwned,
ast::SelfRegion(lt, mt) => SelfBorrowed(lt.clean(), mt.clean()),
ast::SelfBox(mt) => SelfManaged(mt.clean()),
ast::SelfBox => SelfManaged,
}
}
}

3
src/librustdoc/html/format.rs
View file

@ -405,8 +405,7 @@ impl<'a> fmt::Default for Method<'a> {
clean::SelfStatic => {},
clean::SelfValue => args.push_str("self"),
clean::SelfOwned => args.push_str("~self"),
clean::SelfManaged(clean::Mutable) => args.push_str("@mut self"),
clean::SelfManaged(clean::Immutable) => args.push_str("@self"),
clean::SelfManaged => args.push_str("@self"),
clean::SelfBorrowed(Some(ref lt), clean::Immutable) => {
args.push_str(format!("&amp;{} self", *lt));
}