Skip to content

Commit ad67344

Browse files
author
Ulrik Sverdrup
committed
---
yaml --- r: 209313 b: refs/heads/auto c: 06304ed h: refs/heads/master i: 209311: 4763afd v: v3
1 parent 03a9f2f commit ad67344

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: d1cd689b4867e915e42264175d54c45f22180206
13+
refs/heads/auto: 06304ed52201ea0cae7a09f2546123c78a60a193
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustdoc/html/render.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2429,10 +2429,11 @@ fn render_impl(w: &mut fmt::Formatter, i: &Impl, link: AssocItemLink,
24292429

24302430
fn item_typedef(w: &mut fmt::Formatter, it: &clean::Item,
24312431
t: &clean::Typedef) -> fmt::Result {
2432-
try!(write!(w, "<pre class='rust typedef'>type {}{} = {};</pre>",
2432+
try!(write!(w, "<pre class='rust typedef'>type {}{}{where_clause} = {type_};</pre>",
24332433
it.name.as_ref().unwrap(),
24342434
t.generics,
2435-
t.type_));
2435+
where_clause = WhereClause(&t.generics),
2436+
type_ = t.type_));
24362437

24372438
document(w, it)
24382439
}

branches/auto/src/test/rustdoc/where.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ pub enum Foxtrot<F> { Foxtrot1(F) }
4242
// @has foo/trait.MyTrait.html '//*[@id="implementors-list"]//code' \
4343
// "impl<F> MyTrait for Foxtrot<F> where F: MyTrait"
4444
impl<F> MyTrait for Foxtrot<F> where F: MyTrait {}
45+
46+
// @has foo/type.Golf.html '//pre[@class="rust typedef"]' \
47+
// "type Golf<T> where T: Clone = (T, T)"
48+
pub type Golf<T> where T: Clone = (T, T);

0 commit comments

Comments
 (0)