From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../auxiliary/allowed-through-unstable-core.rs | 14 -- .../auxiliary/ctor-stability.rs | 8 - .../stability-attribute/auxiliary/default_body.rs | 29 --- .../auxiliary/lint-stability-reexport.rs | 9 - .../auxiliary/lint-stability.rs | 188 ----------------- .../auxiliary/stability-attribute-implies.rs | 8 - .../auxiliary/stability_attribute_issue.rs | 9 - .../auxiliary/stable-in-unstable-core.rs | 8 - .../auxiliary/stable-in-unstable-std.rs | 11 - .../auxiliary/unstable_generic_param.rs | 229 --------------------- 10 files changed, 513 deletions(-) delete mode 100644 src/test/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/ctor-stability.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/default_body.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/lint-stability-reexport.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/lint-stability.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/stability-attribute-implies.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs delete mode 100644 src/test/ui/stability-attribute/auxiliary/unstable_generic_param.rs (limited to 'src/test/ui/stability-attribute/auxiliary') diff --git a/src/test/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs b/src/test/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs deleted file mode 100644 index b597009a3..000000000 --- a/src/test/ui/stability-attribute/auxiliary/allowed-through-unstable-core.rs +++ /dev/null @@ -1,14 +0,0 @@ -#![crate_type = "lib"] -#![feature(staged_api)] -#![feature(rustc_attrs)] -#![stable(feature = "stable_test_feature", since = "1.2.0")] - -#[unstable(feature = "unstable_test_feature", issue = "1")] -pub mod unstable_module { - #[stable(feature = "stable_test_feature", since = "1.2.0")] - #[rustc_allowed_through_unstable_modules] - pub trait OldStableTraitAllowedThoughUnstable {} - - #[stable(feature = "stable_test_feature", since = "1.2.0")] - pub trait NewStableTraitNotAllowedThroughUnstable {} -} diff --git a/src/test/ui/stability-attribute/auxiliary/ctor-stability.rs b/src/test/ui/stability-attribute/auxiliary/ctor-stability.rs deleted file mode 100644 index 74c6023d7..000000000 --- a/src/test/ui/stability-attribute/auxiliary/ctor-stability.rs +++ /dev/null @@ -1,8 +0,0 @@ -#![crate_type = "lib"] -#![feature(staged_api)] -#![stable(feature = "none", since = "1.0")] - -#[stable(feature = "none", since = "1.0")] -pub enum Foo { - A, -} diff --git a/src/test/ui/stability-attribute/auxiliary/default_body.rs b/src/test/ui/stability-attribute/auxiliary/default_body.rs deleted file mode 100644 index 3a177419d..000000000 --- a/src/test/ui/stability-attribute/auxiliary/default_body.rs +++ /dev/null @@ -1,29 +0,0 @@ -#![crate_type = "lib"] -#![feature(staged_api, rustc_attrs)] -#![stable(feature = "stable_feature", since = "1.0.0")] - -#[stable(feature = "stable_feature", since = "1.0.0")] -pub trait JustTrait { - #[stable(feature = "stable_feature", since = "1.0.0")] - #[rustc_default_body_unstable(feature = "constant_default_body", issue = "none")] - const CONSTANT: usize = 0; - - #[rustc_default_body_unstable(feature = "fun_default_body", issue = "none")] - #[stable(feature = "stable_feature", since = "1.0.0")] - fn fun() {} -} - -#[rustc_must_implement_one_of(eq, neq)] -#[stable(feature = "stable_feature", since = "1.0.0")] -pub trait Equal { - #[rustc_default_body_unstable(feature = "eq_default_body", issue = "none")] - #[stable(feature = "stable_feature", since = "1.0.0")] - fn eq(&self, other: &Self) -> bool { - !self.neq(other) - } - - #[stable(feature = "stable_feature", since = "1.0.0")] - fn neq(&self, other: &Self) -> bool { - !self.eq(other) - } -} diff --git a/src/test/ui/stability-attribute/auxiliary/lint-stability-reexport.rs b/src/test/ui/stability-attribute/auxiliary/lint-stability-reexport.rs deleted file mode 100644 index 9884731d5..000000000 --- a/src/test/ui/stability-attribute/auxiliary/lint-stability-reexport.rs +++ /dev/null @@ -1,9 +0,0 @@ -#![crate_type = "lib"] -#![feature(staged_api)] -#![stable(feature = "lint_stability", since = "1.0.0")] - -extern crate lint_stability; - -// Re-exporting without enabling the feature "unstable_test_feature" in this crate -#[unstable(feature = "unstable_test_feature", issue = "none")] -pub use lint_stability::unstable_text; diff --git a/src/test/ui/stability-attribute/auxiliary/lint-stability.rs b/src/test/ui/stability-attribute/auxiliary/lint-stability.rs deleted file mode 100644 index 99c29dcdd..000000000 --- a/src/test/ui/stability-attribute/auxiliary/lint-stability.rs +++ /dev/null @@ -1,188 +0,0 @@ -#![crate_name="lint_stability"] -#![crate_type = "lib"] -#![feature(staged_api)] -#![feature(associated_type_defaults)] -#![stable(feature = "lint_stability", since = "1.0.0")] - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[deprecated(since = "1.0.0", note = "text")] -pub fn deprecated() {} -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[deprecated(since = "1.0.0", note = "text")] -pub fn deprecated_text() {} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[deprecated(since = "99.99.99", note = "text")] -pub fn deprecated_future() {} - -#[unstable(feature = "unstable_test_feature", issue = "none")] -#[deprecated(since = "1.0.0", note = "text")] -pub fn deprecated_unstable() {} -#[unstable(feature = "unstable_test_feature", issue = "none")] -#[deprecated(since = "1.0.0", note = "text")] -pub fn deprecated_unstable_text() {} - -#[unstable(feature = "unstable_test_feature", issue = "none")] -pub fn unstable() {} -#[unstable(feature = "unstable_test_feature", reason = "text", issue = "none")] -pub fn unstable_text() {} - -#[stable(feature = "rust1", since = "1.0.0")] -pub fn stable() {} -#[stable(feature = "rust1", since = "1.0.0")] -pub fn stable_text() {} - -#[stable(feature = "rust1", since = "1.0.0")] -pub struct MethodTester; - -impl MethodTester { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - #[deprecated(since = "1.0.0", note = "text")] - pub fn method_deprecated(&self) {} - #[stable(feature = "stable_test_feature", since = "1.0.0")] - #[deprecated(since = "1.0.0", note = "text")] - pub fn method_deprecated_text(&self) {} - - #[unstable(feature = "unstable_test_feature", issue = "none")] - #[deprecated(since = "1.0.0", note = "text")] - pub fn method_deprecated_unstable(&self) {} - #[unstable(feature = "unstable_test_feature", issue = "none")] - #[deprecated(since = "1.0.0", note = "text")] - pub fn method_deprecated_unstable_text(&self) {} - - #[unstable(feature = "unstable_test_feature", issue = "none")] - pub fn method_unstable(&self) {} - #[unstable(feature = "unstable_test_feature", reason = "text", issue = "none")] - pub fn method_unstable_text(&self) {} - - #[stable(feature = "rust1", since = "1.0.0")] - pub fn method_stable(&self) {} - #[stable(feature = "rust1", since = "1.0.0")] - pub fn method_stable_text(&self) {} -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub trait Trait { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - #[deprecated(since = "1.0.0", note = "text")] - fn trait_deprecated(&self) {} - #[stable(feature = "stable_test_feature", since = "1.0.0")] - #[deprecated(since = "1.0.0", note = "text")] - fn trait_deprecated_text(&self) {} - - #[unstable(feature = "unstable_test_feature", issue = "none")] - #[deprecated(since = "1.0.0", note = "text")] - fn trait_deprecated_unstable(&self) {} - #[unstable(feature = "unstable_test_feature", issue = "none")] - #[deprecated(since = "1.0.0", note = "text")] - fn trait_deprecated_unstable_text(&self) {} - - #[unstable(feature = "unstable_test_feature", issue = "none")] - fn trait_unstable(&self) {} - #[unstable(feature = "unstable_test_feature", reason = "text", issue = "none")] - fn trait_unstable_text(&self) {} - - #[stable(feature = "rust1", since = "1.0.0")] - fn trait_stable(&self) {} - #[stable(feature = "rust1", since = "1.0.0")] - fn trait_stable_text(&self) {} -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub trait TraitWithAssociatedTypes { - #[unstable(feature = "unstable_test_feature", issue = "none")] - type TypeUnstable = u8; - #[stable(feature = "stable_test_feature", since = "1.0.0")] - #[deprecated(since = "1.0.0", note = "text")] - type TypeDeprecated = u8; -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -impl Trait for MethodTester {} - -#[unstable(feature = "unstable_test_feature", issue = "none")] -pub trait UnstableTrait { fn dummy(&self) { } } - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[deprecated(since = "1.0.0", note = "text")] -pub trait DeprecatedTrait { - #[stable(feature = "stable_test_feature", since = "1.0.0")] fn dummy(&self) { } -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[deprecated(since = "1.0.0", note = "text")] -pub struct DeprecatedStruct { - #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize -} -#[unstable(feature = "unstable_test_feature", issue = "none")] -#[deprecated(since = "1.0.0", note = "text")] -pub struct DeprecatedUnstableStruct { - #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize -} -#[unstable(feature = "unstable_test_feature", issue = "none")] -pub struct UnstableStruct { - #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize -} -#[stable(feature = "rust1", since = "1.0.0")] -pub struct StableStruct { - #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize -} -#[unstable(feature = "unstable_test_feature", issue = "none")] -pub enum UnstableEnum {} -#[stable(feature = "rust1", since = "1.0.0")] -pub enum StableEnum {} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[deprecated(since = "1.0.0", note = "text")] -pub struct DeprecatedUnitStruct; -#[unstable(feature = "unstable_test_feature", issue = "none")] -#[deprecated(since = "1.0.0", note = "text")] -pub struct DeprecatedUnstableUnitStruct; -#[unstable(feature = "unstable_test_feature", issue = "none")] -pub struct UnstableUnitStruct; -#[stable(feature = "rust1", since = "1.0.0")] -pub struct StableUnitStruct; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub enum Enum { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - #[deprecated(since = "1.0.0", note = "text")] - DeprecatedVariant, - #[unstable(feature = "unstable_test_feature", issue = "none")] - #[deprecated(since = "1.0.0", note = "text")] - DeprecatedUnstableVariant, - #[unstable(feature = "unstable_test_feature", issue = "none")] - UnstableVariant, - - #[stable(feature = "rust1", since = "1.0.0")] - StableVariant, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[deprecated(since = "1.0.0", note = "text")] -pub struct DeprecatedTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); -#[unstable(feature = "unstable_test_feature", issue = "none")] -#[deprecated(since = "1.0.0", note = "text")] -pub struct DeprecatedUnstableTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); -#[unstable(feature = "unstable_test_feature", issue = "none")] -pub struct UnstableTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); -#[stable(feature = "rust1", since = "1.0.0")] -pub struct StableTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[macro_export] -macro_rules! macro_test { - () => (deprecated()); -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[macro_export] -macro_rules! macro_test_arg { - ($func:expr) => ($func); -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[macro_export] -macro_rules! macro_test_arg_nested { - ($func:ident) => (macro_test_arg!($func())); -} diff --git a/src/test/ui/stability-attribute/auxiliary/stability-attribute-implies.rs b/src/test/ui/stability-attribute/auxiliary/stability-attribute-implies.rs deleted file mode 100644 index 468be1bc1..000000000 --- a/src/test/ui/stability-attribute/auxiliary/stability-attribute-implies.rs +++ /dev/null @@ -1,8 +0,0 @@ -#![feature(staged_api)] -#![stable(feature = "stability_attribute_implies", since = "1.0.0")] - -#[stable(feature = "foo", since = "1.62.0")] -pub fn foo() {} - -#[unstable(feature = "foobar", issue = "1", implied_by = "foo")] -pub fn foobar() {} diff --git a/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs b/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs deleted file mode 100644 index 4e5333289..000000000 --- a/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs +++ /dev/null @@ -1,9 +0,0 @@ -#![feature(staged_api)] -#![stable(feature = "stable_test_feature", since = "1.2.0")] - - -#[unstable(feature = "unstable_test_feature", issue = "1")] -pub fn unstable() {} - -#[unstable(feature = "unstable_test_feature", reason = "message", issue = "2")] -pub fn unstable_msg() {} diff --git a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs b/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs deleted file mode 100644 index e45b00f99..000000000 --- a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-core.rs +++ /dev/null @@ -1,8 +0,0 @@ -#![feature(staged_api)] -#![stable(feature = "stable_test_feature", since = "1.2.0")] - -#[unstable(feature = "unstable_test_feature", issue = "1")] -pub mod new_unstable_module { - #[stable(feature = "stable_test_feature", since = "1.2.0")] - pub trait OldTrait {} -} diff --git a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs b/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs deleted file mode 100644 index 28ad8c28d..000000000 --- a/src/test/ui/stability-attribute/auxiliary/stable-in-unstable-std.rs +++ /dev/null @@ -1,11 +0,0 @@ -#![feature(staged_api)] -#![feature(unstable_test_feature)] -#![stable(feature = "stable_test_feature", since = "1.2.0")] - -extern crate stable_in_unstable_core; - -#[stable(feature = "stable_test_feature", since = "1.2.0")] -pub mod old_stable_module { - #[stable(feature = "stable_test_feature", since = "1.2.0")] - pub use stable_in_unstable_core::new_unstable_module::OldTrait; -} diff --git a/src/test/ui/stability-attribute/auxiliary/unstable_generic_param.rs b/src/test/ui/stability-attribute/auxiliary/unstable_generic_param.rs deleted file mode 100644 index 1d6a6bd4e..000000000 --- a/src/test/ui/stability-attribute/auxiliary/unstable_generic_param.rs +++ /dev/null @@ -1,229 +0,0 @@ -#![crate_type = "lib"] -#![feature(staged_api)] -#![stable(feature = "stable_test_feature", since = "1.0.0")] - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub trait Trait1<#[unstable(feature = "unstable_default", issue = "none")] T = ()> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - fn foo() -> T; -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub trait Trait2<#[unstable(feature = "unstable_default", issue = "none")] T = usize> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - fn foo() -> T; -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub trait Trait3 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - fn foo() -> T; -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Struct1<#[unstable(feature = "unstable_default", issue = "none")] T = usize> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub field: T, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Struct2 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub field: T, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Struct3 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub field1: A, - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub field2: B, -} - -#[deprecated(since = "1.1.0", note = "test")] -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Struct4 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub field: A, -} - -#[deprecated(since = "1.1.0", note = "test")] -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Struct5<#[unstable(feature = "unstable_default", issue = "none")] A = usize> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub field: A, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Struct6<#[unstable(feature = "unstable_default6", issue = "none")] T = usize> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub field: T, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const STRUCT1: Struct1 = Struct1 { field: 1 }; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const STRUCT2: Struct2 = Struct2 { field: 1 }; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const STRUCT3: Struct3 = Struct3 { field1: 1, field2: 2 }; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const STRUCT4: Struct4 = Struct4 { field: 1 }; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const STRUCT5: Struct5 = Struct5 { field: 1 }; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub enum Enum1<#[unstable(feature = "unstable_default", issue = "none")] T = usize> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - Some(#[stable(feature = "stable_test_feature", since = "1.0.0")] T), - #[stable(feature = "stable_test_feature", since = "1.0.0")] - None, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub enum Enum2 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - Some(#[stable(feature = "stable_test_feature", since = "1.0.0")] T), - #[stable(feature = "stable_test_feature", since = "1.0.0")] - None, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub enum Enum3 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - Ok(#[stable(feature = "stable_test_feature", since = "1.0.0")] T), - #[stable(feature = "stable_test_feature", since = "1.0.0")] - Err(#[stable(feature = "stable_test_feature", since = "1.0.0")] E), -} - -#[deprecated(since = "1.1.0", note = "test")] -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub enum Enum4 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - Some(#[stable(feature = "stable_test_feature", since = "1.0.0")] T), - #[stable(feature = "stable_test_feature", since = "1.0.0")] - None, -} - -#[deprecated(since = "1.1.0", note = "test")] -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub enum Enum5<#[unstable(feature = "unstable_default", issue = "none")] T = usize> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - Some(#[stable(feature = "stable_test_feature", since = "1.0.0")] T), - #[stable(feature = "stable_test_feature", since = "1.0.0")] - None, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub enum Enum6<#[unstable(feature = "unstable_default6", issue = "none")] T = usize> { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - Some(#[stable(feature = "stable_test_feature", since = "1.0.0")] T), - #[stable(feature = "stable_test_feature", since = "1.0.0")] - None, -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ENUM1: Enum1 = Enum1::Some(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ENUM2: Enum2 = Enum2::Some(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ENUM3: Enum3 = Enum3::Ok(1); -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ENUM3B: Enum3 = Enum3::Err(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ENUM4: Enum4 = Enum4::Some(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ENUM5: Enum5 = Enum5::Some(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub type Alias1<#[unstable(feature = "unstable_default", issue = "none")] T = usize> = Option; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub type Alias2 = Option; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub type Alias3 = - Result; - -#[deprecated(since = "1.1.0", note = "test")] -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub type Alias4 = Option; - -#[deprecated(since = "1.1.0", note = "test")] -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub type Alias5<#[unstable(feature = "unstable_default", issue = "none")] T = usize> = Option; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub type Alias6<#[unstable(feature = "unstable_default6", issue = "none")] T = usize> = Option; - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ALIAS1: Alias1 = Alias1::Some(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ALIAS2: Alias2 = Alias2::Some(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ALIAS3: Alias3 = Alias3::Ok(1); -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ALIAS3B: Alias3 = Alias3::Err(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ALIAS4: Alias4 = Alias4::Some(1); - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub const ALIAS5: Alias5 = Alias5::Some(1); - - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub trait Alloc {} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct System {} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -impl Alloc for System {} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Box1 { - ptr: *mut T, - alloc: A, -} - -impl Box1 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub fn new(mut t: T) -> Self { - unsafe { Self { ptr: &mut t, alloc: System {} } } - } -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Box2 { - ptr: *mut T, - alloc: A, -} - -impl Box2 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub fn new(mut t: T) -> Self { - Self { ptr: &mut t, alloc: System {} } - } -} - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -pub struct Box3 { - ptr: *mut T, -} - -impl Box3 { - #[stable(feature = "stable_test_feature", since = "1.0.0")] - pub fn new(mut t: T) -> Self { - Self { ptr: &mut t } - } -} -- cgit v1.2.3