summaryrefslogtreecommitdiffstats
path: root/src/test/rustdoc-json/unions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:19:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:19:03 +0000
commit64d98f8ee037282c35007b64c2649055c56af1db (patch)
tree5492bcf97fce41ee1c0b1cc2add283f3e66cdab0 /src/test/rustdoc-json/unions
parentAdding debian version 1.67.1+dfsg1-1. (diff)
downloadrustc-64d98f8ee037282c35007b64c2649055c56af1db.tar.xz
rustc-64d98f8ee037282c35007b64c2649055c56af1db.zip
Merging upstream version 1.68.2+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/test/rustdoc-json/unions')
-rw-r--r--src/test/rustdoc-json/unions/impl.rs15
-rw-r--r--src/test/rustdoc-json/unions/union.rs15
2 files changed, 0 insertions, 30 deletions
diff --git a/src/test/rustdoc-json/unions/impl.rs b/src/test/rustdoc-json/unions/impl.rs
deleted file mode 100644
index 4454a69ec..000000000
--- a/src/test/rustdoc-json/unions/impl.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![no_std]
-
-// @is "$.index[*][?(@.name=='Ux')].visibility" \"public\"
-// @is "$.index[*][?(@.name=='Ux')].kind" \"union\"
-pub union Ux {
- a: u32,
- b: u64
-}
-
-// @is "$.index[*][?(@.name=='Num')].visibility" \"public\"
-// @is "$.index[*][?(@.name=='Num')].kind" \"trait\"
-pub trait Num {}
-
-// @count "$.index[*][?(@.name=='Ux')].inner.impls" 1
-impl Num for Ux {}
diff --git a/src/test/rustdoc-json/unions/union.rs b/src/test/rustdoc-json/unions/union.rs
deleted file mode 100644
index c9df2b81c..000000000
--- a/src/test/rustdoc-json/unions/union.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// @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 }
-}