Skip to content

Commit

Permalink
auto merge of #14906 : P1start/rust/rustdoc-lifetimes, r=huonw
Browse files Browse the repository at this point in the history
rustdoc was previously formatting lifetimes with two apostrophes, presumably as a result of #14797.
  • Loading branch information
bors committed Jun 16, 2014
2 parents 7ec7805 + 0204ca1 commit 5abf794
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ impl Clean<Lifetime> for ty::RegionParameterDef {
impl Clean<Option<Lifetime>> for ty::Region {
fn clean(&self) -> Option<Lifetime> {
match *self {
ty::ReStatic => Some(Lifetime("static".to_string())),
ty::ReStatic => Some(Lifetime("'static".to_string())),
ty::ReLateBound(_, ty::BrNamed(_, name)) =>
Some(Lifetime(token::get_name(name).get().to_string())),
ty::ReEarlyBound(_, _, _, name) => Some(Lifetime(name.clean())),
Expand Down

0 comments on commit 5abf794

Please sign in to comment.