nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-17 09:23:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #101914 - aDotInTheVoid:rdj-path-union-docs, r=jsha

Browse Source 
rustdoc-json-types: Document that ResolvedPath can also be a union

r? rustdoc
This commit is contained in:
Michael Howell 2022-09-16 20:37:17 -07:00 committed by GitHub
commit bba939ee94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rustdoc-json-types/lib.rs
View File

@ -542,7 +542,7 @@ pub enum Term {
#[serde(rename_all = "snake_case")]
#[serde(tag = "kind", content = "inner")]
pub enum Type {
/// Structs and enums
/// Structs, enums, and unions
ResolvedPath(Path),
DynTrait(DynTrait),
/// Parameterized types

8
src/test/rustdoc-json/unions/union.rs
View File

@ -1,7 +1,15 @@
// @has "$.index[*][?(@.name=='Union')].visibility" \"public\"
// @has "$.index[*][?(@.name=='Union')].kind" \"union\"
// @!has "$.index[*][?(@.name=='Union')].inner.struct_type"
// @set Union = "$.index[*][?(@.name=='Union')].id"
pub union Union {
int: i32,
float: f32,
}
// @is "$.index[*][?(@.name=='make_int_union')].inner.decl.output.kind" '"resolved_path"'
// @is "$.index[*][?(@.name=='make_int_union')].inner.decl.output.inner.id" $Union
pub fn make_int_union(int: i32) -> Union {
Union { int }
}