Merge pull request #92 from Enselic/hrtb-for-function-pointer

Render HRTBs for WherePredicate::BoundPredicate

Author: Enselic

Cargo.lock

@@ -17,7 +17,7 @@ thiserror = "1.0.29"
 
 [dependencies.rustdoc-types]
 # path = "/Users/martin/src/rustdoc-types"
-version = "0.10.0"
+version = "0.11.0"
 
 [dev-dependencies]
 assert_cmd = "2.0.4"

Cargo.toml

@@ -14,7 +14,7 @@ The library comes with a thin bin wrapper that can be used to explore the capabi
 # Build and install the thin bin wrapper with a recent stable Rust toolchain
 cargo install public-api
 
-# Install nightly-2022-03-14 or later so you can build up-to-date rustdoc JSON files
+# Install nightly-2022-05-19 or later so you can build up-to-date rustdoc JSON files
 rustup install nightly
 ```
 
@@ -110,7 +110,8 @@ labeled issues.
 
 | public-api    | Understands the rustdoc JSON output of  |
 | ------------- | --------------------------------------- |
-| v0.10.x       | nightly-2022-03-14 —                    |
+| v0.11.x       | nightly-2022-05-19                      |
+| v0.10.x       | nightly-2022-03-14 — nightly-2022-05-18 |
 | v0.5.x        | nightly-2022-02-23 — nightly-2022-03-13 |
 | v0.2.x        | nightly-2022-01-19 — nightly-2022-02-22 |
 | v0.0.5        | nightly-2021-10-11 — nightly-2022-01-18 |

README.md

@@ -58,7 +58,7 @@ pub use item_iterator::PublicItem;
 /// The rustdoc JSON format is still changing, so every now and then we update
 /// this library to support the latest format. If you use this version of
 /// nightly or later, you should be fine.
-pub const MINIMUM_RUSTDOC_JSON_VERSION: &str = "nightly-2022-03-14";
+pub const MINIMUM_RUSTDOC_JSON_VERSION: &str = "nightly-2022-05-19";
 
 /// Contains various options that you can pass to [`public_api_from_rustdoc_json_str`].
 #[derive(Copy, Clone, Debug)]

src/lib.rs

@@ -621,7 +621,12 @@ fn render_where_predicates(root: &Crate, where_predicates: &[WherePredicate]) ->
 fn render_where_predicate(root: &Crate, where_predicate: &WherePredicate) -> Vec<Token> {
     let mut output = vec![];
     match where_predicate {
-        WherePredicate::BoundPredicate { type_, bounds } => {
+        WherePredicate::BoundPredicate {
+            type_,
+            bounds,
+            generic_params,
+        } => {
+            output.extend(render_higher_rank_trait_bounds(root, generic_params));
             output.extend(render_type(root, type_));
             output.extend(colon());
             output.extend(render_generic_bounds(root, bounds));

src/render.rs

@@ -22,6 +22,25 @@
 //   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //   SOFTWARE.
 
+// @has foo/trait.Trait.html
+pub trait Trait<'x> {}
+
+// @has foo/fn.test1.html
+// @has - '//pre' "pub fn test1<T>() where for<'a> &'a T: Iterator,"
+pub fn test1<T>()
+where
+    for<'a> &'a T: Iterator,
+{
+}
+
+// @has foo/fn.test2.html
+// @has - '//pre' "pub fn test2<T>() where for<'a, 'b> &'a T: Trait<'b>,"
+pub fn test2<T>()
+where
+    for<'a, 'b> &'a T: Trait<'b>,
+{
+}
+
 // @has foo/fn.test3.html
 // @has - '//pre' "pub fn test3<F>() where F: for<'a, 'b> Fn(&'a u8, &'b u8),"
 pub fn test3<F>()

tests/crates/comprehensive_api/src/higher_ranked_trait_bounds.rs

@@ -37,6 +37,8 @@ pub fn comprehensive_api::functions::return_tuple() -> (bool, Basic)
 pub fn comprehensive_api::functions::somewhere<T, U>(t: T, u: U) where T: Display, U: Debug
 pub fn comprehensive_api::functions::struct_arg(s: PrivateField)
 pub fn comprehensive_api::functions::synthetic_arg(t: impl Simple) -> impl Simple
+pub fn comprehensive_api::higher_ranked_trait_bounds::test1<T>() where for<'a> &'a T: Iterator
+pub fn comprehensive_api::higher_ranked_trait_bounds::test2<T>() where for<'a, 'b> &'a T: Trait<'b>
 pub fn comprehensive_api::higher_ranked_trait_bounds::test3<F>() where F: for<'a, 'b> Fn(&'a u8, &'b u8)
 pub fn comprehensive_api::structs::Plain::f()
 pub fn comprehensive_api::structs::Plain::new() -> Plain
@@ -85,6 +87,7 @@ pub struct field comprehensive_api::structs::WithLifetimeAndGenericParam::unit_r
 pub struct field comprehensive_api::unions::Basic::x: usize
 pub struct field comprehensive_api::unions::Basic::y: usize
 pub trait comprehensive_api::RngCore
+pub trait comprehensive_api::higher_ranked_trait_bounds::Trait<'x>
 pub trait comprehensive_api::traits::AssociatedConst
 pub trait comprehensive_api::traits::AssociatedConstDefault
 pub trait comprehensive_api::traits::AssociatedType