Skip to content

Commit

Permalink
Rollup merge of #112906 - fmease:rustdoc-render-assoc-ty-body-before-…
Browse files Browse the repository at this point in the history
…where-clause, r=notriddle

rustdoc: render the body of associated types before the where-clause

Fixes #112903.
  • Loading branch information
matthiaskrgr authored Jun 22, 2023
2 parents cc93c5f + b866113 commit 3ba66df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/librustdoc/html/render/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -799,10 +799,11 @@ fn assoc_type(
if !bounds.is_empty() {
write!(w, ": {}", print_generic_bounds(bounds, cx))
}
write!(w, "{}", print_where_clause(generics, cx, indent, Ending::NoNewline));
// Render the default before the where-clause which aligns with the new recommended style. See #89122.
if let Some(default) = default {
write!(w, " = {}", default.print(cx))
}
write!(w, "{}", print_where_clause(generics, cx, indent, Ending::NoNewline));
}

fn assoc_method(
Expand Down
4 changes: 2 additions & 2 deletions tests/rustdoc/generic-associated-types/gats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ impl LendingIterator for () {
pub struct Infinite<T>(T);

// @has foo/trait.LendingIterator.html
// @has - '//*[@id="associatedtype.Item-2"]//h4[@class="code-header"]' "type Item<'a> where Self: 'a = &'a T"
// @has - '//*[@id="associatedtype.Item-2"]//h4[@class="code-header"]' "type Item<'a> = &'a T where Self: 'a"
impl<T> LendingIterator for Infinite<T> {
type Item<'a> where Self: 'a = &'a T;
type Item<'a> = &'a T where Self: 'a;

fn next<'a>(&'a self) -> Self::Item<'a> {
&self.0
Expand Down

0 comments on commit 3ba66df

Please sign in to comment.