Commit 8be6f1c

committed

Add rustdoc-json support for use<>

1 parent 2994bb4 commit 8be6f1cCopy full SHA for 8be6f1c

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ ignore = [`
`22`	`22`	`"/tests/rustdoc-ui/", # Some have syntax errors, some are whitespace-sensitive.`
`23`	`23`	`"/tests/ui/", # Some have syntax errors, some are whitespace-sensitive.`
`24`	`24`	"/tests/ui-fulldeps/", # Some are whitespace-sensitive (e.g. `// ~ERROR` comments).
	`25`	`+ # #[cfg(bootstrap)] so that t-release sees this when they search for it`
	`26`	`+ "/tests/rustdoc-json/impl-trait-precise-capturing.rs",`
`25`	`27`
`26`	`28`	`# Do not format submodules.`
`27`	`29`	`# FIXME: sync submodule list with tidy/bootstrap/etc`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,7 @@ impl FromWithTcx<clean::GenericBound> for GenericBound {`
`542`	`542`	`}`
`543`	`543`	`}`
`544`	`544`	`Outlives(lifetime) => GenericBound::Outlives(convert_lifetime(lifetime)),`
	`545`	`+ Use(args) => GenericBound::Use(args.into_iter().map(\|arg\| arg.to_string()).collect()),`
`545`	`546`	`}`
`546`	`547`	`}`
`547`	`548`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};`
`8`	`8`	`use std::path::PathBuf;`
`9`	`9`
`10`	`10`	`/// rustdoc format-version.`
`11`		`-pub const FORMAT_VERSION: u32 = 31;`
	`11`	`+pub const FORMAT_VERSION: u32 = 32;`
`12`	`12`
`13`	`13`	/// A `Crate` is the root of the emitted JSON blob. It contains all type/documentation information
`14`	`14`	`/// about the language items in the local crate, as well as info about external items to allow`
`@@ -538,6 +538,8 @@ pub enum GenericBound {`
`538`	`538`	`modifier: TraitBoundModifier,`
`539`	`539`	`},`
`540`	`540`	`Outlives(String),`
	`541`	+ /// `use<'a, T>` precise-capturing bound syntax
	`542`	`+ Use(Vec<String>),`
`541`	`543`	`}`
`542`	`544`
`543`	`545`	`#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,7 @@ impl<'a> Validator<'a> {`
`298`	`298`	`generic_params.iter().for_each(\|gpd\| self.check_generic_param_def(gpd));`
`299`	`299`	`}`
`300`	`300`	`GenericBound::Outlives(_) => {}`
	`301`	`+ GenericBound::Use(_) => {}`
`301`	`302`	`}`
`302`	`303`	`}`
`303`	`304`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+#![feature(precise_capturing)]`
	`2`	`+`
	`3`	`+// @is "$.index[*][?(@.name=='hello')].inner.function.decl.output.impl_trait[1].use[0]" \"\'a\"`
	`4`	`+// @is "$.index[*][?(@.name=='hello')].inner.function.decl.output.impl_trait[1].use[1]" \"T\"`
	`5`	`+// @is "$.index[*][?(@.name=='hello')].inner.function.decl.output.impl_trait[1].use[2]" \"N\"`
	`6`	`+pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> {}`

Comments

(0)