about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-06-22 05:42:01 +0000
committerbors <bors@rust-lang.org>2023-06-22 05:42:01 +0000
commit0928a1f7574f5ca019b5443b3a90008588d18c8c (patch)
tree788b76148326768640c76fe0ea5476508e220abf /src
parentfba636a38754d5e0809f15e535eb399b59de463e (diff)
parentb13c9417cf90bf06e21db6acf5bd1a87bcb5b786 (diff)
downloadrust-0928a1f7574f5ca019b5443b3a90008588d18c8c.tar.gz
rust-0928a1f7574f5ca019b5443b3a90008588d18c8c.zip
Auto merge of #112914 - matthiaskrgr:rollup-f0kdqh9, r=matthiaskrgr
Rollup of 4 pull requests

Successful merges:

 - #112876 (Don't substitute a GAT that has mismatched generics in `OpaqueTypeCollector`)
 - #112906 (rustdoc: render the body of associated types before the where-clause)
 - #112907 (Update cargo)
 - #112908 (Print def_id on EarlyBoundRegion debug)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/html/render/mod.rs3
m---------src/tools/cargo0
2 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index c5d6771c2fd..f15c9bacec0 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -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(
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject dead4b8740c4b6a8ed5211e37c99cf81d01c3b1
+Subproject 4cebd130ebca3bc219180a54f3e26cc1b14a91d