Skip to content

Commit

Permalink
Auto merge of #33600 - ollie27:rustdoc_impl_params, r=alexcrichton
Browse files Browse the repository at this point in the history
rustdoc: Fix missing type parameters on impls

They were broken by #32558.

Fixes: #33592
  • Loading branch information
bors committed May 15, 2016
2 parents 8492b6a + 538de73 commit dd0ef17
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 8 deletions.
7 changes: 0 additions & 7 deletions src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1534,13 +1534,6 @@ impl Type {
}
}

pub fn trait_name(&self) -> Option<String> {
match *self {
ResolvedPath { ref path, .. } => Some(path.last_name()),
_ => None,
}
}

pub fn is_generic(&self) -> bool {
match *self {
ResolvedPath { is_generic, .. } => is_generic,
Expand Down
8 changes: 7 additions & 1 deletion src/librustdoc/html/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,13 @@ fn fmt_impl(i: &clean::Impl, f: &mut fmt::Formatter, link_trait: bool) -> fmt::R
if link_trait {
write!(f, "{}", *ty)?;
} else {
write!(f, "{}", ty.trait_name().unwrap())?;
match *ty {
clean::ResolvedPath{ typarams: None, ref path, is_generic: false, .. } => {
let last = path.segments.last().unwrap();
write!(f, "{}{}", last.name, last.params)?;
}
_ => unreachable!(),
}
}
write!(f, " for ")?;
}
Expand Down
23 changes: 23 additions & 0 deletions src/test/rustdoc/issue-33592.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![crate_name = "foo"]

pub trait Foo<T> {}

pub struct Bar;

pub struct Baz;

// @has foo/trait.Foo.html '//code' 'impl Foo<i32> for Bar'
impl Foo<i32> for Bar {}

// @has foo/trait.Foo.html '//code' 'impl<T> Foo<T> for Baz'
impl<T> Foo<T> for Baz {}

0 comments on commit dd0ef17

Please sign in to comment.