From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/rustdoc-json/fn_pointer/abi.rs | 25 ------------------------- src/test/rustdoc-json/fn_pointer/generics.rs | 14 -------------- src/test/rustdoc-json/fn_pointer/qualifiers.rs | 9 --------- 3 files changed, 48 deletions(-) delete mode 100644 src/test/rustdoc-json/fn_pointer/abi.rs delete mode 100644 src/test/rustdoc-json/fn_pointer/generics.rs delete mode 100644 src/test/rustdoc-json/fn_pointer/qualifiers.rs (limited to 'src/test/rustdoc-json/fn_pointer') diff --git a/src/test/rustdoc-json/fn_pointer/abi.rs b/src/test/rustdoc-json/fn_pointer/abi.rs deleted file mode 100644 index 3c1a453d1..000000000 --- a/src/test/rustdoc-json/fn_pointer/abi.rs +++ /dev/null @@ -1,25 +0,0 @@ -// ignore-tidy-linelength - -#![feature(abi_vectorcall)] -#![feature(c_unwind)] - -// @is "$.index[*][?(@.name=='AbiRust')].inner.type.inner.header.abi" \"Rust\" -pub type AbiRust = fn(); - -// @is "$.index[*][?(@.name=='AbiC')].inner.type.inner.header.abi" '{"C": {"unwind": false}}' -pub type AbiC = extern "C" fn(); - -// @is "$.index[*][?(@.name=='AbiSystem')].inner.type.inner.header.abi" '{"System": {"unwind": false}}' -pub type AbiSystem = extern "system" fn(); - -// @is "$.index[*][?(@.name=='AbiCUnwind')].inner.type.inner.header.abi" '{"C": {"unwind": true}}' -pub type AbiCUnwind = extern "C-unwind" fn(); - -// @is "$.index[*][?(@.name=='AbiSystemUnwind')].inner.type.inner.header.abi" '{"System": {"unwind": true}}' -pub type AbiSystemUnwind = extern "system-unwind" fn(); - -// @is "$.index[*][?(@.name=='AbiVecorcall')].inner.type.inner.header.abi.Other" '"\"vectorcall\""' -pub type AbiVecorcall = extern "vectorcall" fn(); - -// @is "$.index[*][?(@.name=='AbiVecorcallUnwind')].inner.type.inner.header.abi.Other" '"\"vectorcall-unwind\""' -pub type AbiVecorcallUnwind = extern "vectorcall-unwind" fn(); diff --git a/src/test/rustdoc-json/fn_pointer/generics.rs b/src/test/rustdoc-json/fn_pointer/generics.rs deleted file mode 100644 index a93b01ac2..000000000 --- a/src/test/rustdoc-json/fn_pointer/generics.rs +++ /dev/null @@ -1,14 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -// @count "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[*]" 1 -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[0][0]" '"val"' -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[0][1].kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[0][1].inner.lifetime" \"\'c\" -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.output" '{ "kind": "primitive", "inner": "i32" }' -// @count "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[*]" 1 -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[0].name" \"\'c\" -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[0].kind" '{ "lifetime": { "outlives": [] } }' -pub type WithHigherRankTraitBounds = for<'c> fn(val: &'c i32) -> i32; diff --git a/src/test/rustdoc-json/fn_pointer/qualifiers.rs b/src/test/rustdoc-json/fn_pointer/qualifiers.rs deleted file mode 100644 index bd65bb3ee..000000000 --- a/src/test/rustdoc-json/fn_pointer/qualifiers.rs +++ /dev/null @@ -1,9 +0,0 @@ -// @is "$.index[*][?(@.name=='FnPointer')].inner.type.inner.header.unsafe" false -// @is "$.index[*][?(@.name=='FnPointer')].inner.type.inner.header.const" false -// @is "$.index[*][?(@.name=='FnPointer')].inner.type.inner.header.async" false -pub type FnPointer = fn(); - -// @is "$.index[*][?(@.name=='UnsafePointer')].inner.type.inner.header.unsafe" true -// @is "$.index[*][?(@.name=='UnsafePointer')].inner.type.inner.header.const" false -// @is "$.index[*][?(@.name=='UnsafePointer')].inner.type.inner.header.async" false -pub type UnsafePointer = unsafe fn(); -- cgit v1.2.3