Skip to content

Commit 0204ca1

Browse files
committed
Fix rustdoc's formatting of lifetimes
rustdoc was previously formatting lifetimes with two apostrophes, presumably as a result of #14797.
1 parent 6d8342f commit 0204ca1

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/librustdoc/clean/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ impl Clean<Lifetime> for ty::RegionParameterDef {
617617
impl Clean<Option<Lifetime>> for ty::Region {
618618
fn clean(&self) -> Option<Lifetime> {
619619
match *self {
620-
ty::ReStatic => Some(Lifetime("static".to_string())),
620+
ty::ReStatic => Some(Lifetime("'static".to_string())),
621621
ty::ReLateBound(_, ty::BrNamed(_, name)) =>
622622
Some(Lifetime(token::get_name(name).get().to_string())),
623623
ty::ReEarlyBound(_, _, _, name) => Some(Lifetime(name.clean())),

src/librustdoc/html/format.rs

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ impl fmt::Show for clean::Generics {
9191

9292
impl fmt::Show for clean::Lifetime {
9393
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
94-
try!(f.write("'".as_bytes()));
9594
try!(f.write(self.get_ref().as_bytes()));
9695
Ok(())
9796
}

0 commit comments

Comments
 (0)