Skip to content

Commit 6f7aa79

Browse files
author
Ulrik Sverdrup
committed
---
yaml --- r: 225274 b: refs/heads/stable c: 06304ed h: refs/heads/master v: v3
1 parent a1d969a commit 6f7aa79

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
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: d1cd689b4867e915e42264175d54c45f22180206
32+
refs/heads/stable: 06304ed52201ea0cae7a09f2546123c78a60a193
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/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/stable/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)