languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-18 14:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

UnsafeCell now has no niches, ever.

Browse source
This commit is contained in:
Oli Scherer 2022-07-07 10:46:22 +00:00
parent e78e747f53
commit 2a899dc1cf
22 changed files with 73 additions and 512 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_attr/src/builtin.rs
View file

@ -856,7 +856,6 @@ pub enum ReprAttr {
ReprSimd, ReprSimd,
ReprTransparent, ReprTransparent,
ReprAlign(u32), ReprAlign(u32),
ReprNoNiche,
} }
#[derive(Eq, PartialEq, Debug, Copy, Clone)] #[derive(Eq, PartialEq, Debug, Copy, Clone)]
@ -904,7 +903,6 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
sym::packed => Some(ReprPacked(1)), sym::packed => Some(ReprPacked(1)),
sym::simd => Some(ReprSimd), sym::simd => Some(ReprSimd),
sym::transparent => Some(ReprTransparent), sym::transparent => Some(ReprTransparent),
sym::no_niche => Some(ReprNoNiche),
sym::align => { sym::align => {
let mut err = struct_span_err!( let mut err = struct_span_err!(
diagnostic, diagnostic,
@ -943,7 +941,7 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
Ok(literal) => acc.push(ReprPacked(literal)), Ok(literal) => acc.push(ReprPacked(literal)),
Err(message) => literal_error = Some(message), Err(message) => literal_error = Some(message),
}; };
} else if matches!(name, sym::C | sym::simd | sym::transparent | sym::no_niche) } else if matches!(name, sym::C | sym::simd | sym::transparent)
|| int_type_of_word(name).is_some() || int_type_of_word(name).is_some()
{ {
recognised = true; recognised = true;
@ -1001,7 +999,7 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
} else { } else {
if matches!( if matches!(
meta_item.name_or_empty(), meta_item.name_or_empty(),
sym::C | sym::simd | sym::transparent | sym::no_niche sym::C | sym::simd | sym::transparent
) || int_type_of_word(meta_item.name_or_empty()).is_some() ) || int_type_of_word(meta_item.name_or_empty()).is_some()
{ {
recognised = true; recognised = true;
@ -1039,7 +1037,7 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
.emit(); .emit();
} else if matches!( } else if matches!(
meta_item.name_or_empty(), meta_item.name_or_empty(),
sym::C | sym::simd | sym::transparent | sym::no_niche sym::C | sym::simd | sym::transparent
) || int_type_of_word(meta_item.name_or_empty()).is_some() ) || int_type_of_word(meta_item.name_or_empty()).is_some()
{ {
recognised = true; recognised = true;

2
compiler/rustc_const_eval/src/interpret/intern.rs
View file

@ -217,7 +217,7 @@ fn visit_aggregate(
} }
if let Some(def) = mplace.layout.ty.ty_adt_def() { if let Some(def) = mplace.layout.ty.ty_adt_def() {
if Some(def.did()) == self.ecx.tcx.lang_items().unsafe_cell_type() { if def.is_unsafe_cell() {
// We are crossing over an `UnsafeCell`, we can mutate again. This means that // We are crossing over an `UnsafeCell`, we can mutate again. This means that
// References we encounter inside here are interned as pointing to mutable // References we encounter inside here are interned as pointing to mutable
// allocations. // allocations.

2
compiler/rustc_const_eval/src/interpret/validity.rs
View file

@ -821,7 +821,7 @@ fn visit_value(&mut self, op: &OpTy<'tcx, M::PointerTag>) -> InterpResult<'tcx>
// Special check preventing `UnsafeCell` in the inner part of constants // Special check preventing `UnsafeCell` in the inner part of constants
if let Some(def) = op.layout.ty.ty_adt_def() { if let Some(def) = op.layout.ty.ty_adt_def() {
if matches!(self.ctfe_mode, Some(CtfeValidationMode::Const { inner: true, .. })) if matches!(self.ctfe_mode, Some(CtfeValidationMode::Const { inner: true, .. }))
&& Some(def.did()) == self.ecx.tcx.lang_items().unsafe_cell_type() && def.is_unsafe_cell()
{ {
throw_validation_failure!(self.path, { "`UnsafeCell` in a `const`" }); throw_validation_failure!(self.path, { "`UnsafeCell` in a `const`" });
} }

4
compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs
View file

@ -96,13 +96,13 @@ fn in_any_value_of_ty<'tcx>(cx: &ConstCx<'_, 'tcx>, ty: Ty<'tcx>) -> bool {
} }
fn in_adt_inherently<'tcx>( fn in_adt_inherently<'tcx>(
cx: &ConstCx<'_, 'tcx>, _cx: &ConstCx<'_, 'tcx>,
adt: AdtDef<'tcx>, adt: AdtDef<'tcx>,
_: SubstsRef<'tcx>, _: SubstsRef<'tcx>,
) -> bool { ) -> bool {
// Exactly one type, `UnsafeCell`, has the `HasMutInterior` qualif inherently. // Exactly one type, `UnsafeCell`, has the `HasMutInterior` qualif inherently.
// It arises structurally for all other types. // It arises structurally for all other types.
Some(adt.did()) == cx.tcx.lang_items().unsafe_cell_type() adt.is_unsafe_cell()
} }
} }

3
compiler/rustc_feature/src/active.rs
View file

@ -156,9 +156,6 @@ pub fn set(&self, features: &mut Features, span: Span) {
(active, intrinsics, "1.0.0", None, None), (active, intrinsics, "1.0.0", None, None),
/// Allows using `#[lang = ".."]` attribute for linking items to special compiler logic. /// Allows using `#[lang = ".."]` attribute for linking items to special compiler logic.
(active, lang_items, "1.0.0", None, None), (active, lang_items, "1.0.0", None, None),
/// Allows `#[repr(no_niche)]` (an implementation detail of `rustc`,
/// it is not on path for eventual stabilization).
(active, no_niche, "1.42.0", None, None),
/// Allows using `#[omit_gdb_pretty_printer_section]`. /// Allows using `#[omit_gdb_pretty_printer_section]`.
(active, omit_gdb_pretty_printer_section, "1.5.0", None, None), (active, omit_gdb_pretty_printer_section, "1.5.0", None, None),
/// Allows using `#[prelude_import]` on glob `use` items. /// Allows using `#[prelude_import]` on glob `use` items.

2
compiler/rustc_lint/src/types.rs
View file

@ -705,7 +705,7 @@ fn ty_is_known_nonnull<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>, mode: CItemKi
// Types with a `#[repr(no_niche)]` attribute have their niche hidden. // Types with a `#[repr(no_niche)]` attribute have their niche hidden.
// The attribute is used by the UnsafeCell for example (the only use so far). // The attribute is used by the UnsafeCell for example (the only use so far).
if def.repr().hide_niche() { if def.is_unsafe_cell() {
return false; return false;
} }

11
compiler/rustc_middle/src/ty/adt.rs
View file

@ -52,6 +52,8 @@ pub struct AdtFlags: u32 {
/// Indicates whether the variant list of this ADT is `#[non_exhaustive]`. /// Indicates whether the variant list of this ADT is `#[non_exhaustive]`.
/// (i.e., this flag is never set unless this ADT is an enum). /// (i.e., this flag is never set unless this ADT is an enum).
const IS_VARIANT_LIST_NON_EXHAUSTIVE = 1 << 8; const IS_VARIANT_LIST_NON_EXHAUSTIVE = 1 << 8;
/// Indicates whether the type is `UnsafeCell`.
const IS_UNSAFE_CELL = 1 << 9;
} }
} }
@ -242,6 +244,9 @@ pub(super) fn new(
if Some(did) == tcx.lang_items().manually_drop() { if Some(did) == tcx.lang_items().manually_drop() {
flags |= AdtFlags::IS_MANUALLY_DROP; flags |= AdtFlags::IS_MANUALLY_DROP;
} }
if Some(did) == tcx.lang_items().unsafe_cell_type() {
flags |= AdtFlags::IS_UNSAFE_CELL;
}
AdtDefData { did, variants, flags, repr } AdtDefData { did, variants, flags, repr }
} }
@ -328,6 +333,12 @@ pub fn is_box(self) -> bool {
self.flags().contains(AdtFlags::IS_BOX) self.flags().contains(AdtFlags::IS_BOX)
} }
/// Returns `true` if this is UnsafeCell<T>.
#[inline]
pub fn is_unsafe_cell(self) -> bool {
self.flags().contains(AdtFlags::IS_UNSAFE_CELL)
}
/// Returns `true` if this is `ManuallyDrop<T>`. /// Returns `true` if this is `ManuallyDrop<T>`.
#[inline] #[inline]
pub fn is_manually_drop(self) -> bool { pub fn is_manually_drop(self) -> bool {

52
compiler/rustc_middle/src/ty/layout.rs
View file

@ -542,14 +542,12 @@ fn univariant_uninterned(
debug!("univariant offset: {:?} field: {:#?}", offset, field); debug!("univariant offset: {:?} field: {:#?}", offset, field);
offsets[i as usize] = offset; offsets[i as usize] = offset;
if !repr.hide_niche() { if let Some(mut niche) = field.largest_niche {
if let Some(mut niche) = field.largest_niche { let available = niche.available(dl);
let available = niche.available(dl); if available > largest_niche_available {
if available > largest_niche_available { largest_niche_available = available;
largest_niche_available = available; niche.offset += offset;
niche.offset += offset; largest_niche = Some(niche);
largest_niche = Some(niche);
}
} }
} }
@ -1104,23 +1102,29 @@ fn layout_of_uncached(&self, ty: Ty<'tcx>) -> Result<Layout<'tcx>, LayoutError<'
assert!(valid_range.end >= end); assert!(valid_range.end >= end);
valid_range.end = end; valid_range.end = end;
} }
if def.is_unsafe_cell() {
// Update `largest_niche` if we have introduced a larger niche. match scalar {
let niche = if def.repr().hide_niche() { Scalar::Initialized { value, valid_range } => {
None *valid_range = WrappingRange::full(value.size(dl))
} else { }
Niche::from_scalar(dl, Size::ZERO, *scalar) // Already doesn't have any niches
}; Scalar::Union { .. } => {}
if let Some(niche) = niche { }
match st.largest_niche { st.largest_niche = None;
Some(largest_niche) => { } else {
// Replace the existing niche even if they're equal, // Update `largest_niche` if we have introduced a larger niche.
// because this one is at a lower offset. let niche = Niche::from_scalar(dl, Size::ZERO, *scalar);
if largest_niche.available(dl) <= niche.available(dl) { if let Some(niche) = niche {
st.largest_niche = Some(niche); match st.largest_niche {
} Some(largest_niche) => {
// Replace the existing niche even if they're equal,
// because this one is at a lower offset.
if largest_niche.available(dl) <= niche.available(dl) {
st.largest_niche = Some(niche);
}
}
None => st.largest_niche = Some(niche),
} }
None => st.largest_niche = Some(niche),
} }
} }
} }

10
compiler/rustc_middle/src/ty/mod.rs
View file

@ -1719,11 +1719,9 @@ pub struct ReprFlags: u8 {
const IS_TRANSPARENT = 1 << 2; const IS_TRANSPARENT = 1 << 2;
// Internal only for now. If true, don't reorder fields. // Internal only for now. If true, don't reorder fields.
const IS_LINEAR = 1 << 3; const IS_LINEAR = 1 << 3;
// If true, don't expose any niche to type's context.
const HIDE_NICHE = 1 << 4;
// If true, the type's layout can be randomized using // If true, the type's layout can be randomized using
// the seed stored in `ReprOptions.layout_seed` // the seed stored in `ReprOptions.layout_seed`
const RANDOMIZE_LAYOUT = 1 << 5; const RANDOMIZE_LAYOUT = 1 << 4;
// Any of these flags being set prevent field reordering optimisation. // Any of these flags being set prevent field reordering optimisation.
const IS_UNOPTIMISABLE = ReprFlags::IS_C.bits const IS_UNOPTIMISABLE = ReprFlags::IS_C.bits
| ReprFlags::IS_SIMD.bits | ReprFlags::IS_SIMD.bits
@ -1780,7 +1778,6 @@ pub fn new(tcx: TyCtxt<'_>, did: DefId) -> ReprOptions {
ReprFlags::empty() ReprFlags::empty()
} }
attr::ReprTransparent => ReprFlags::IS_TRANSPARENT, attr::ReprTransparent => ReprFlags::IS_TRANSPARENT,
attr::ReprNoNiche => ReprFlags::HIDE_NICHE,
attr::ReprSimd => ReprFlags::IS_SIMD, attr::ReprSimd => ReprFlags::IS_SIMD,
attr::ReprInt(i) => { attr::ReprInt(i) => {
size = Some(i); size = Some(i);
@ -1833,11 +1830,6 @@ pub fn linear(&self) -> bool {
self.flags.contains(ReprFlags::IS_LINEAR) self.flags.contains(ReprFlags::IS_LINEAR)
} }
#[inline]
pub fn hide_niche(&self) -> bool {
self.flags.contains(ReprFlags::HIDE_NICHE)
}
/// Returns the discriminant type, given these `repr` options. /// Returns the discriminant type, given these `repr` options.
/// This must only be called on enums! /// This must only be called on enums!
pub fn discr_type(&self) -> attr::IntType { pub fn discr_type(&self) -> attr::IntType {

21
compiler/rustc_passes/src/check_attr.rs
View file

@ -1808,21 +1808,6 @@ fn check_repr(
_ => ("a", "struct, enum, or union"), _ => ("a", "struct, enum, or union"),
} }
} }
sym::no_niche => {
if !self.tcx.features().enabled(sym::no_niche) {
feature_err(
&self.tcx.sess.parse_sess,
sym::no_niche,
hint.span(),
"the attribute `repr(no_niche)` is currently unstable",
)
.emit();
}
match target {
Target::Struct | Target::Enum => continue,
_ => ("a", "struct or enum"),
}
}
sym::i8 sym::i8
| sym::u8 | sym::u8
| sym::i16 | sym::i16
@ -1870,10 +1855,8 @@ fn check_repr(
// This is not ideal, but tracking precisely which ones are at fault is a huge hassle. // This is not ideal, but tracking precisely which ones are at fault is a huge hassle.
let hint_spans = hints.iter().map(|hint| hint.span()); let hint_spans = hints.iter().map(|hint| hint.span());
// Error on repr(transparent, <anything else apart from no_niche>). // Error on repr(transparent, <anything else>).
let non_no_niche = |hint: &&NestedMetaItem| hint.name_or_empty() != sym::no_niche; if is_transparent && hints.len() > 1 {
let non_no_niche_count = hints.iter().filter(non_no_niche).count();
if is_transparent && non_no_niche_count > 1 {
let hint_spans: Vec<_> = hint_spans.clone().collect(); let hint_spans: Vec<_> = hint_spans.clone().collect();
struct_span_err!( struct_span_err!(
self.tcx.sess, self.tcx.sess,

2
compiler/rustc_span/src/symbol.rs
View file

@ -979,7 +979,6 @@
no_link, no_link,
no_main, no_main,
no_mangle, no_mangle,
no_niche,
no_sanitize, no_sanitize,
no_stack_check, no_stack_check,
no_start, no_start,
@ -1152,7 +1151,6 @@
repr128, repr128,
repr_align, repr_align,
repr_align_enum, repr_align_enum,
repr_no_niche,
repr_packed, repr_packed,
repr_simd, repr_simd,
repr_transparent, repr_transparent,

1
library/core/src/cell.rs
View file

@ -1856,7 +1856,6 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
#[lang = "unsafe_cell"] #[lang = "unsafe_cell"]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[repr(transparent)] #[repr(transparent)]
#[repr(no_niche)] // rust-lang/rust#68303.
pub struct UnsafeCell<T: ?Sized> { pub struct UnsafeCell<T: ?Sized> {
value: T, value: T,
} }

1
library/core/src/lib.rs
View file

@ -191,7 +191,6 @@
#![feature(never_type)] #![feature(never_type)]
#![feature(no_core)] #![feature(no_core)]
#![feature(no_coverage)] // rust-lang/rust#84605 #![feature(no_coverage)] // rust-lang/rust#84605
#![feature(no_niche)] // rust-lang/rust#68303
#![feature(platform_intrinsics)] #![feature(platform_intrinsics)]
#![feature(prelude_import)] #![feature(prelude_import)]
#![feature(repr_simd)] #![feature(repr_simd)]

5
src/test/ui/layout/unsafe-cell-hides-niche.rs
View file

@ -5,8 +5,6 @@
// run-pass // run-pass
#![feature(no_niche)]
use std::cell::UnsafeCell; use std::cell::UnsafeCell;
use std::mem::size_of; use std::mem::size_of;
use std::num::NonZeroU32 as N32; use std::num::NonZeroU32 as N32;
@ -16,8 +14,7 @@
#[repr(transparent)] #[repr(transparent)]
struct Transparent<T>(T); struct Transparent<T>(T);
#[repr(no_niche)] struct NoNiche<T>(UnsafeCell<T>);
struct NoNiche<T>(T);
fn main() { fn main() {
assert_eq!(size_of::<Option<Wrapper<u32>>>(), 8); assert_eq!(size_of::<Option<Wrapper<u32>>>(), 8);

4
src/test/ui/lint/clashing-extern-fn.rs
View file

@ -1,7 +1,6 @@
// check-pass // check-pass
// aux-build:external_extern_fn.rs // aux-build:external_extern_fn.rs
#![crate_type = "lib"] #![crate_type = "lib"]
#![feature(no_niche)]
#![warn(clashing_extern_declarations)] #![warn(clashing_extern_declarations)]
mod redeclared_different_signature { mod redeclared_different_signature {
@ -400,9 +399,8 @@ mod b {
#[repr(transparent)] #[repr(transparent)]
struct Transparent { x: NonZeroUsize } struct Transparent { x: NonZeroUsize }
#[repr(no_niche)]
#[repr(transparent)] #[repr(transparent)]
struct TransparentNoNiche { y: NonZeroUsize } struct TransparentNoNiche { y: UnsafeCell<NonZeroUsize> }
extern "C" { extern "C" {
fn hidden_niche_transparent() -> Option<Transparent>; fn hidden_niche_transparent() -> Option<Transparent>;

40
src/test/ui/lint/clashing-extern-fn.stderr
View file

@ -1,5 +1,5 @@
warning: `clash` redeclared with a different signature warning: `clash` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:15:13 --> $DIR/clashing-extern-fn.rs:14:13
| |
LL | fn clash(x: u8); LL | fn clash(x: u8);
| ---------------- `clash` previously declared here | ---------------- `clash` previously declared here
@ -8,7 +8,7 @@ LL | fn clash(x: u64);
| ^^^^^^^^^^^^^^^^^ this signature doesn't match the previous declaration | ^^^^^^^^^^^^^^^^^ this signature doesn't match the previous declaration
| |
note: the lint level is defined here note: the lint level is defined here
--> $DIR/clashing-extern-fn.rs:5:9 --> $DIR/clashing-extern-fn.rs:4:9
| |
LL | #![warn(clashing_extern_declarations)] LL | #![warn(clashing_extern_declarations)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -16,7 +16,7 @@ LL | #![warn(clashing_extern_declarations)]
found `unsafe extern "C" fn(u64)` found `unsafe extern "C" fn(u64)`
warning: `extern_link_name` redeclared with a different signature warning: `extern_link_name` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:53:9 --> $DIR/clashing-extern-fn.rs:52:9
| |
LL | / #[link_name = "extern_link_name"] LL | / #[link_name = "extern_link_name"]
LL | | fn some_new_name(x: i16); LL | | fn some_new_name(x: i16);
@ -29,7 +29,7 @@ LL | fn extern_link_name(x: u32);
found `unsafe extern "C" fn(u32)` found `unsafe extern "C" fn(u32)`
warning: `some_other_extern_link_name` redeclares `some_other_new_name` with a different signature warning: `some_other_extern_link_name` redeclares `some_other_new_name` with a different signature
--> $DIR/clashing-extern-fn.rs:56:9 --> $DIR/clashing-extern-fn.rs:55:9
| |
LL | fn some_other_new_name(x: i16); LL | fn some_other_new_name(x: i16);
| ------------------------------- `some_other_new_name` previously declared here | ------------------------------- `some_other_new_name` previously declared here
@ -43,7 +43,7 @@ LL | | fn some_other_extern_link_name(x: u32);
found `unsafe extern "C" fn(u32)` found `unsafe extern "C" fn(u32)`
warning: `other_both_names_different` redeclares `link_name_same` with a different signature warning: `other_both_names_different` redeclares `link_name_same` with a different signature
--> $DIR/clashing-extern-fn.rs:60:9 --> $DIR/clashing-extern-fn.rs:59:9
| |
LL | / #[link_name = "link_name_same"] LL | / #[link_name = "link_name_same"]
LL | | fn both_names_different(x: i16); LL | | fn both_names_different(x: i16);
@ -58,7 +58,7 @@ LL | | fn other_both_names_different(x: u32);
found `unsafe extern "C" fn(u32)` found `unsafe extern "C" fn(u32)`
warning: `different_mod` redeclared with a different signature warning: `different_mod` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:73:9 --> $DIR/clashing-extern-fn.rs:72:9
| |
LL | fn different_mod(x: u8); LL | fn different_mod(x: u8);
| ------------------------ `different_mod` previously declared here | ------------------------ `different_mod` previously declared here
@ -70,7 +70,7 @@ LL | fn different_mod(x: u64);
found `unsafe extern "C" fn(u64)` found `unsafe extern "C" fn(u64)`
warning: `variadic_decl` redeclared with a different signature warning: `variadic_decl` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:83:9 --> $DIR/clashing-extern-fn.rs:82:9
| |
LL | fn variadic_decl(x: u8, ...); LL | fn variadic_decl(x: u8, ...);
| ----------------------------- `variadic_decl` previously declared here | ----------------------------- `variadic_decl` previously declared here
@ -82,7 +82,7 @@ LL | fn variadic_decl(x: u8);
found `unsafe extern "C" fn(u8)` found `unsafe extern "C" fn(u8)`
warning: `weigh_banana` redeclared with a different signature warning: `weigh_banana` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:143:13 --> $DIR/clashing-extern-fn.rs:142:13
| |
LL | fn weigh_banana(count: *const Banana) -> u64; LL | fn weigh_banana(count: *const Banana) -> u64;
| --------------------------------------------- `weigh_banana` previously declared here | --------------------------------------------- `weigh_banana` previously declared here
@ -94,7 +94,7 @@ LL | fn weigh_banana(count: *const Banana) -> u64;
found `unsafe extern "C" fn(*const three::Banana) -> u64` found `unsafe extern "C" fn(*const three::Banana) -> u64`
warning: `draw_point` redeclared with a different signature warning: `draw_point` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:172:13 --> $DIR/clashing-extern-fn.rs:171:13
| |
LL | fn draw_point(p: Point); LL | fn draw_point(p: Point);
| ------------------------ `draw_point` previously declared here | ------------------------ `draw_point` previously declared here
@ -106,7 +106,7 @@ LL | fn draw_point(p: Point);
found `unsafe extern "C" fn(sameish_members::b::Point)` found `unsafe extern "C" fn(sameish_members::b::Point)`
warning: `origin` redeclared with a different signature warning: `origin` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:198:13 --> $DIR/clashing-extern-fn.rs:197:13
| |
LL | fn origin() -> Point3; LL | fn origin() -> Point3;
| ---------------------- `origin` previously declared here | ---------------------- `origin` previously declared here
@ -118,7 +118,7 @@ LL | fn origin() -> Point3;
found `unsafe extern "C" fn() -> same_sized_members_clash::b::Point3` found `unsafe extern "C" fn() -> same_sized_members_clash::b::Point3`
warning: `transparent_incorrect` redeclared with a different signature warning: `transparent_incorrect` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:221:13 --> $DIR/clashing-extern-fn.rs:220:13
| |
LL | fn transparent_incorrect() -> T; LL | fn transparent_incorrect() -> T;
| -------------------------------- `transparent_incorrect` previously declared here | -------------------------------- `transparent_incorrect` previously declared here
@ -130,7 +130,7 @@ LL | fn transparent_incorrect() -> isize;
found `unsafe extern "C" fn() -> isize` found `unsafe extern "C" fn() -> isize`
warning: `missing_return_type` redeclared with a different signature warning: `missing_return_type` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:239:13 --> $DIR/clashing-extern-fn.rs:238:13
| |
LL | fn missing_return_type() -> usize; LL | fn missing_return_type() -> usize;
| ---------------------------------- `missing_return_type` previously declared here | ---------------------------------- `missing_return_type` previously declared here
@ -142,7 +142,7 @@ LL | fn missing_return_type();
found `unsafe extern "C" fn()` found `unsafe extern "C" fn()`
warning: `non_zero_usize` redeclared with a different signature warning: `non_zero_usize` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:257:13 --> $DIR/clashing-extern-fn.rs:256:13
| |
LL | fn non_zero_usize() -> core::num::NonZeroUsize; LL | fn non_zero_usize() -> core::num::NonZeroUsize;
| ----------------------------------------------- `non_zero_usize` previously declared here | ----------------------------------------------- `non_zero_usize` previously declared here
@ -154,7 +154,7 @@ LL | fn non_zero_usize() -> usize;
found `unsafe extern "C" fn() -> usize` found `unsafe extern "C" fn() -> usize`
warning: `non_null_ptr` redeclared with a different signature warning: `non_null_ptr` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:259:13 --> $DIR/clashing-extern-fn.rs:258:13
| |
LL | fn non_null_ptr() -> core::ptr::NonNull<usize>; LL | fn non_null_ptr() -> core::ptr::NonNull<usize>;
| ----------------------------------------------- `non_null_ptr` previously declared here | ----------------------------------------------- `non_null_ptr` previously declared here
@ -166,7 +166,7 @@ LL | fn non_null_ptr() -> *const usize;
found `unsafe extern "C" fn() -> *const usize` found `unsafe extern "C" fn() -> *const usize`
warning: `option_non_zero_usize_incorrect` redeclared with a different signature warning: `option_non_zero_usize_incorrect` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:357:13 --> $DIR/clashing-extern-fn.rs:356:13
| |
LL | fn option_non_zero_usize_incorrect() -> usize; LL | fn option_non_zero_usize_incorrect() -> usize;
| ---------------------------------------------- `option_non_zero_usize_incorrect` previously declared here | ---------------------------------------------- `option_non_zero_usize_incorrect` previously declared here
@ -178,7 +178,7 @@ LL | fn option_non_zero_usize_incorrect() -> isize;
found `unsafe extern "C" fn() -> isize` found `unsafe extern "C" fn() -> isize`
warning: `option_non_null_ptr_incorrect` redeclared with a different signature warning: `option_non_null_ptr_incorrect` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:359:13 --> $DIR/clashing-extern-fn.rs:358:13
| |
LL | fn option_non_null_ptr_incorrect() -> *const usize; LL | fn option_non_null_ptr_incorrect() -> *const usize;
| --------------------------------------------------- `option_non_null_ptr_incorrect` previously declared here | --------------------------------------------------- `option_non_null_ptr_incorrect` previously declared here
@ -190,7 +190,7 @@ LL | fn option_non_null_ptr_incorrect() -> *const isize;
found `unsafe extern "C" fn() -> *const isize` found `unsafe extern "C" fn() -> *const isize`
warning: `hidden_niche_transparent_no_niche` redeclared with a different signature warning: `hidden_niche_transparent_no_niche` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:410:13 --> $DIR/clashing-extern-fn.rs:408:13
| |
LL | fn hidden_niche_transparent_no_niche() -> usize; LL | fn hidden_niche_transparent_no_niche() -> usize;
| ------------------------------------------------ `hidden_niche_transparent_no_niche` previously declared here | ------------------------------------------------ `hidden_niche_transparent_no_niche` previously declared here
@ -202,7 +202,7 @@ LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoN
found `unsafe extern "C" fn() -> Option<TransparentNoNiche>` found `unsafe extern "C" fn() -> Option<TransparentNoNiche>`
warning: `hidden_niche_unsafe_cell` redeclared with a different signature warning: `hidden_niche_unsafe_cell` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:414:13 --> $DIR/clashing-extern-fn.rs:412:13
| |
LL | fn hidden_niche_unsafe_cell() -> usize; LL | fn hidden_niche_unsafe_cell() -> usize;
| --------------------------------------- `hidden_niche_unsafe_cell` previously declared here | --------------------------------------- `hidden_niche_unsafe_cell` previously declared here
@ -214,7 +214,7 @@ LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZeroUsize
found `unsafe extern "C" fn() -> Option<UnsafeCell<NonZeroUsize>>` found `unsafe extern "C" fn() -> Option<UnsafeCell<NonZeroUsize>>`
warning: `extern` block uses type `Option<TransparentNoNiche>`, which is not FFI-safe warning: `extern` block uses type `Option<TransparentNoNiche>`, which is not FFI-safe
--> $DIR/clashing-extern-fn.rs:410:55 --> $DIR/clashing-extern-fn.rs:408:55
| |
LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoNiche>; LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoNiche>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe | ^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
@ -224,7 +224,7 @@ LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoN
= note: enum has no representation hint = note: enum has no representation hint
warning: `extern` block uses type `Option<UnsafeCell<NonZeroUsize>>`, which is not FFI-safe warning: `extern` block uses type `Option<UnsafeCell<NonZeroUsize>>`, which is not FFI-safe
--> $DIR/clashing-extern-fn.rs:414:46 --> $DIR/clashing-extern-fn.rs:412:46
| |
LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZeroUsize>>; LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZeroUsize>>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe

20
src/test/ui/repr/feature-gate-no-niche.rs
View file

@ -1,20 +0,0 @@
use std::num::NonZeroU8 as N8;
use std::num::NonZeroU16 as N16;
#[repr(no_niche)]
pub struct Cloaked(N16);
//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
#[repr(transparent, no_niche)]
pub struct Shadowy(N16);
//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
#[repr(no_niche)]
pub enum Cloaked1 { _A(N16), }
//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
#[repr(no_niche)]
pub enum Cloaked2 { _A(N16), _B(u8, N8) }
//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
fn main() { }

35
src/test/ui/repr/feature-gate-no-niche.stderr
View file

@ -1,35 +0,0 @@
error[E0658]: the attribute `repr(no_niche)` is currently unstable
--> $DIR/feature-gate-no-niche.rs:4:8
|
LL | #[repr(no_niche)]
| ^^^^^^^^
|
= help: add `#![feature(no_niche)]` to the crate attributes to enable
error[E0658]: the attribute `repr(no_niche)` is currently unstable
--> $DIR/feature-gate-no-niche.rs:8:21
|
LL | #[repr(transparent, no_niche)]
| ^^^^^^^^
|
= help: add `#![feature(no_niche)]` to the crate attributes to enable
error[E0658]: the attribute `repr(no_niche)` is currently unstable
--> $DIR/feature-gate-no-niche.rs:12:8
|
LL | #[repr(no_niche)]
| ^^^^^^^^
|
= help: add `#![feature(no_niche)]` to the crate attributes to enable
error[E0658]: the attribute `repr(no_niche)` is currently unstable
--> $DIR/feature-gate-no-niche.rs:16:8
|
LL | #[repr(no_niche)]
| ^^^^^^^^
|
= help: add `#![feature(no_niche)]` to the crate attributes to enable
error: aborting due to 4 previous errors
For more information about this error, try `rustc --explain E0658`.

14
src/test/ui/repr/repr-no-niche-inapplicable-to-unions.rs
View file

@ -1,14 +0,0 @@
#![feature(no_niche)]
use std::num::NonZeroU8 as N8;
use std::num::NonZeroU16 as N16;
#[repr(no_niche)]
pub union Cloaked1 { _A: N16 }
//~^^ ERROR attribute should be applied to a struct or enum [E0517]
#[repr(no_niche)]
pub union Cloaked2 { _A: N16, _B: (u8, N8) }
//~^^ ERROR attribute should be applied to a struct or enum [E0517]
fn main() { }

19
src/test/ui/repr/repr-no-niche-inapplicable-to-unions.stderr
View file

@ -1,19 +0,0 @@
error[E0517]: attribute should be applied to a struct or enum
--> $DIR/repr-no-niche-inapplicable-to-unions.rs:6:8
|
LL | #[repr(no_niche)]
| ^^^^^^^^
LL | pub union Cloaked1 { _A: N16 }
| ------------------------------ not a struct or enum
error[E0517]: attribute should be applied to a struct or enum
--> $DIR/repr-no-niche-inapplicable-to-unions.rs:10:8
|
LL | #[repr(no_niche)]
| ^^^^^^^^
LL | pub union Cloaked2 { _A: N16, _B: (u8, N8) }
| -------------------------------------------- not a struct or enum
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0517`.

327
src/test/ui/repr/repr-no-niche.rs
View file

@ -1,327 +0,0 @@
// run-pass
// This file tests repr(no_niche), which causes an struct/enum to hide
// any niche space that may exist in its internal state from the
// context it appears in.
// Here are the axes this test is seeking to cover:
//
// repr annotation:
// visible: (); cloaked: (no_niche); transparent: (transparent); shadowy: (transparent, no_niche)
//
// enum vs struct
//
// niche-type via type-parameter vs inline declaration
#![feature(decl_macro)]
#![feature(no_niche)]
use std::mem::size_of;
use std::num::{NonZeroU8, NonZeroU16};
mod struct_inline {
use std::num::NonZeroU16 as N16;
#[derive(Debug)] pub struct Visible(N16);
#[repr(no_niche)]
#[derive(Debug)] pub struct Cloaked(N16);
#[repr(transparent)]
#[derive(Debug)] pub struct Transparent(N16);
#[repr(transparent, no_niche)]
#[derive(Debug)] pub struct Shadowy(N16);
}
mod struct_param {
#[derive(Debug)] pub struct Visible<T>(T);
#[repr(no_niche)]
#[derive(Debug)] pub struct Cloaked<T>(T);
#[repr(transparent)]
#[derive(Debug)] pub struct Transparent<T>(T);
#[repr(transparent, no_niche)]
#[derive(Debug)] pub struct Shadowy<T>(T);
}
mod enum_inline {
use crate::two_fifty_six_variant_enum;
use std::num::{NonZeroU8 as N8, NonZeroU16 as N16};
#[derive(Debug)] pub enum Visible1 { _A(N16), }
#[repr(no_niche)]
#[derive(Debug)] pub enum Cloaked1 { _A(N16), }
// (N.B.: transparent enums must be univariant)
#[repr(transparent)]
#[derive(Debug)] pub enum Transparent { _A(N16), }
#[repr(transparent, no_niche)]
#[derive(Debug)] pub enum Shadowy { _A(N16), }
// including multivariant enums for completeness. Payload and
// number of variants (i.e. discriminant size) have been chosen so
// that layout including discriminant is 4 bytes, with no space in
// padding to hide another discrimnant from the surrounding
// context.
//
// (Note that multivariant enums cannot usefully expose a niche in
// general; this test is relying on that.)
two_fifty_six_variant_enum!(Visible2, N8);
two_fifty_six_variant_enum!(#[repr(no_niche)] Cloaked2, N8);
}
mod enum_param {
use super::two_fifty_six_variant_enum;
#[derive(Debug)] pub enum Visible1<T> { _A(T), }
#[repr(no_niche)]
#[derive(Debug)] pub enum Cloaked1<T> { _A(T), }
// (N.B.: transparent enums must be univariant)
#[repr(transparent)]
#[derive(Debug)] pub enum Transparent<T> { _A(T), }
#[repr(transparent, no_niche)]
#[derive(Debug)] pub enum Shadowy<T> { _A(T), }
// including multivariant enums for completeness. Same notes apply
// here as above (assuming `T` is instantiated with `NonZeroU8`).
two_fifty_six_variant_enum!(Visible2<T>);
two_fifty_six_variant_enum!(#[repr(no_niche)] Cloaked2<T>);
}
fn main() {
// sanity-checks
assert_eq!(size_of::<struct_inline::Visible>(), 2);
assert_eq!(size_of::<struct_inline::Cloaked>(), 2);
assert_eq!(size_of::<struct_inline::Transparent>(), 2);
assert_eq!(size_of::<struct_inline::Shadowy>(), 2);
assert_eq!(size_of::<struct_param::Visible<NonZeroU16>>(), 2);
assert_eq!(size_of::<struct_param::Cloaked<NonZeroU16>>(), 2);
assert_eq!(size_of::<struct_param::Transparent<NonZeroU16>>(), 2);
assert_eq!(size_of::<struct_param::Shadowy<NonZeroU16>>(), 2);
assert_eq!(size_of::<enum_inline::Visible1>(), 2);
assert_eq!(size_of::<enum_inline::Cloaked1>(), 2);
assert_eq!(size_of::<enum_inline::Transparent>(), 2); // transparent enums are univariant
assert_eq!(size_of::<enum_inline::Shadowy>(), 2);
assert_eq!(size_of::<enum_inline::Visible2>(), 4);
assert_eq!(size_of::<enum_inline::Cloaked2>(), 4);
assert_eq!(size_of::<enum_param::Visible1<NonZeroU16>>(), 2);
assert_eq!(size_of::<enum_param::Cloaked1<NonZeroU16>>(), 2);
assert_eq!(size_of::<enum_param::Transparent<NonZeroU16>>(), 2);
assert_eq!(size_of::<enum_param::Shadowy<NonZeroU16>>(), 2);
assert_eq!(size_of::<enum_param::Visible2<NonZeroU8>>(), 4);
assert_eq!(size_of::<enum_param::Cloaked2<NonZeroU8>>(), 4);
// now the actual tests of no_niche: how do inputs above compose
// with `Option` type constructor. The cases with a `_+2` are the
// ones where no_niche fires.
assert_eq!(size_of::<Option<struct_inline::Visible>>(), 2);
assert_eq!(size_of::<Option<struct_inline::Cloaked>>(), 2+2);
assert_eq!(size_of::<Option<struct_inline::Transparent>>(), 2);
assert_eq!(size_of::<Option<struct_inline::Shadowy>>(), 2+2);
assert_eq!(size_of::<Option<struct_param::Visible<NonZeroU16>>>(), 2);
assert_eq!(size_of::<Option<struct_param::Cloaked<NonZeroU16>>>(), 2+2);
assert_eq!(size_of::<Option<struct_param::Transparent<NonZeroU16>>>(), 2);
assert_eq!(size_of::<Option<struct_param::Shadowy<NonZeroU16>>>(), 2+2);
assert_eq!(size_of::<Option<enum_inline::Visible1>>(), 2);
assert_eq!(size_of::<Option<enum_inline::Cloaked1>>(), 2+2);
assert_eq!(size_of::<Option<enum_inline::Transparent>>(), 2);
assert_eq!(size_of::<Option<enum_inline::Shadowy>>(), 2+2);
// cannot use niche of multivariant payload
assert_eq!(size_of::<Option<enum_inline::Visible2>>(), 4+2);
assert_eq!(size_of::<Option<enum_inline::Cloaked2>>(), 4+2);
assert_eq!(size_of::<Option<enum_param::Visible1<NonZeroU16>>>(), 2);
assert_eq!(size_of::<Option<enum_param::Cloaked1<NonZeroU16>>>(), 2+2);
assert_eq!(size_of::<Option<enum_param::Transparent<NonZeroU16>>>(), 2);
assert_eq!(size_of::<Option<enum_param::Shadowy<NonZeroU16>>>(), 2+2);
// cannot use niche of multivariant payload
assert_eq!(size_of::<Option<enum_param::Visible2<NonZeroU8>>>(), 4+2);
assert_eq!(size_of::<Option<enum_param::Cloaked2<NonZeroU8>>>(), 4+2);
}
macro two_fifty_six_variant_enum {
($(#[$attr:meta])* $name:ident<$param:ident>) => {
#[derive(Debug)] $(#[$attr])*
pub enum $name<$param> {
_V00($param, u16), _V01(u16, $param), _V02($param, u16), _V03(u16, $param),
_V04($param, u16), _V05(u16, $param), _V06($param, u16), _V07(u16, $param),
_V08($param, u16), _V09(u16, $param), _V0a($param, u16), _V0b(u16, $param),
_V0c($param, u16), _V0d(u16, $param), _V0e($param, u16), _V0f(u16, $param),
_V10($param, u16), _V11(u16, $param), _V12($param, u16), _V13(u16, $param),
_V14($param, u16), _V15(u16, $param), _V16($param, u16), _V17(u16, $param),
_V18($param, u16), _V19(u16, $param), _V1a($param, u16), _V1b(u16, $param),
_V1c($param, u16), _V1d(u16, $param), _V1e($param, u16), _V1f(u16, $param),
_V20($param, u16), _V21(u16, $param), _V22($param, u16), _V23(u16, $param),
_V24($param, u16), _V25(u16, $param), _V26($param, u16), _V27(u16, $param),
_V28($param, u16), _V29(u16, $param), _V2a($param, u16), _V2b(u16, $param),
_V2c($param, u16), _V2d(u16, $param), _V2e($param, u16), _V2f(u16, $param),
_V30($param, u16), _V31(u16, $param), _V32($param, u16), _V33(u16, $param),
_V34($param, u16), _V35(u16, $param), _V36($param, u16), _V37(u16, $param),
_V38($param, u16), _V39(u16, $param), _V3a($param, u16), _V3b(u16, $param),
_V3c($param, u16), _V3d(u16, $param), _V3e($param, u16), _V3f(u16, $param),
_V40($param, u16), _V41(u16, $param), _V42($param, u16), _V43(u16, $param),
_V44($param, u16), _V45(u16, $param), _V46($param, u16), _V47(u16, $param),
_V48($param, u16), _V49(u16, $param), _V4a($param, u16), _V4b(u16, $param),
_V4c($param, u16), _V4d(u16, $param), _V4e($param, u16), _V4f(u16, $param),
_V50($param, u16), _V51(u16, $param), _V52($param, u16), _V53(u16, $param),
_V54($param, u16), _V55(u16, $param), _V56($param, u16), _V57(u16, $param),
_V58($param, u16), _V59(u16, $param), _V5a($param, u16), _V5b(u16, $param),
_V5c($param, u16), _V5d(u16, $param), _V5e($param, u16), _V5f(u16, $param),
_V60($param, u16), _V61(u16, $param), _V62($param, u16), _V63(u16, $param),
_V64($param, u16), _V65(u16, $param), _V66($param, u16), _V67(u16, $param),
_V68($param, u16), _V69(u16, $param), _V6a($param, u16), _V6b(u16, $param),
_V6c($param, u16), _V6d(u16, $param), _V6e($param, u16), _V6f(u16, $param),
_V70($param, u16), _V71(u16, $param), _V72($param, u16), _V73(u16, $param),
_V74($param, u16), _V75(u16, $param), _V76($param, u16), _V77(u16, $param),
_V78($param, u16), _V79(u16, $param), _V7a($param, u16), _V7b(u16, $param),
_V7c($param, u16), _V7d(u16, $param), _V7e($param, u16), _V7f(u16, $param),
_V80($param, u16), _V81(u16, $param), _V82($param, u16), _V83(u16, $param),
_V84($param, u16), _V85(u16, $param), _V86($param, u16), _V87(u16, $param),
_V88($param, u16), _V89(u16, $param), _V8a($param, u16), _V8b(u16, $param),
_V8c($param, u16), _V8d(u16, $param), _V8e($param, u16), _V8f(u16, $param),
_V90($param, u16), _V91(u16, $param), _V92($param, u16), _V93(u16, $param),
_V94($param, u16), _V95(u16, $param), _V96($param, u16), _V97(u16, $param),
_V98($param, u16), _V99(u16, $param), _V9a($param, u16), _V9b(u16, $param),
_V9c($param, u16), _V9d(u16, $param), _V9e($param, u16), _V9f(u16, $param),
_Va0($param, u16), _Va1(u16, $param), _Va2($param, u16), _Va3(u16, $param),
_Va4($param, u16), _Va5(u16, $param), _Va6($param, u16), _Va7(u16, $param),
_Va8($param, u16), _Va9(u16, $param), _Vaa($param, u16), _Vab(u16, $param),
_Vac($param, u16), _Vad(u16, $param), _Vae($param, u16), _Vaf(u16, $param),
_Vb0($param, u16), _Vb1(u16, $param), _Vb2($param, u16), _Vb3(u16, $param),
_Vb4($param, u16), _Vb5(u16, $param), _Vb6($param, u16), _Vb7(u16, $param),
_Vb8($param, u16), _Vb9(u16, $param), _Vba($param, u16), _Vbb(u16, $param),
_Vbc($param, u16), _Vbd(u16, $param), _Vbe($param, u16), _Vbf(u16, $param),
_Vc0($param, u16), _Vc1(u16, $param), _Vc2($param, u16), _Vc3(u16, $param),
_Vc4($param, u16), _Vc5(u16, $param), _Vc6($param, u16), _Vc7(u16, $param),
_Vc8($param, u16), _Vc9(u16, $param), _Vca($param, u16), _Vcb(u16, $param),
_Vcc($param, u16), _Vcd(u16, $param), _Vce($param, u16), _Vcf(u16, $param),
_Vd0($param, u16), _Vd1(u16, $param), _Vd2($param, u16), _Vd3(u16, $param),
_Vd4($param, u16), _Vd5(u16, $param), _Vd6($param, u16), _Vd7(u16, $param),
_Vd8($param, u16), _Vd9(u16, $param), _Vda($param, u16), _Vdb(u16, $param),
_Vdc($param, u16), _Vdd(u16, $param), _Vde($param, u16), _Vdf(u16, $param),
_Ve0($param, u16), _Ve1(u16, $param), _Ve2($param, u16), _Ve3(u16, $param),
_Ve4($param, u16), _Ve5(u16, $param), _Ve6($param, u16), _Ve7(u16, $param),
_Ve8($param, u16), _Ve9(u16, $param), _Vea($param, u16), _Veb(u16, $param),
_Vec($param, u16), _Ved(u16, $param), _Vee($param, u16), _Vef(u16, $param),
_Vf0($param, u16), _Vf1(u16, $param), _Vf2($param, u16), _Vf3(u16, $param),
_Vf4($param, u16), _Vf5(u16, $param), _Vf6($param, u16), _Vf7(u16, $param),
_Vf8($param, u16), _Vf9(u16, $param), _Vfa($param, u16), _Vfb(u16, $param),
_Vfc($param, u16), _Vfd(u16, $param), _Vfe($param, u16), _Vff(u16, $param),
}
},
($(#[$attr:meta])* $name:ident, $param:ty) => {
#[derive(Debug)] $(#[$attr])*
pub enum $name {
_V00($param, u16), _V01(u16, $param), _V02($param, u16), _V03(u16, $param),
_V04($param, u16), _V05(u16, $param), _V06($param, u16), _V07(u16, $param),
_V08($param, u16), _V09(u16, $param), _V0a($param, u16), _V0b(u16, $param),
_V0c($param, u16), _V0d(u16, $param), _V0e($param, u16), _V0f(u16, $param),
_V10($param, u16), _V11(u16, $param), _V12($param, u16), _V13(u16, $param),
_V14($param, u16), _V15(u16, $param), _V16($param, u16), _V17(u16, $param),
_V18($param, u16), _V19(u16, $param), _V1a($param, u16), _V1b(u16, $param),
_V1c($param, u16), _V1d(u16, $param), _V1e($param, u16), _V1f(u16, $param),
_V20($param, u16), _V21(u16, $param), _V22($param, u16), _V23(u16, $param),
_V24($param, u16), _V25(u16, $param), _V26($param, u16), _V27(u16, $param),
_V28($param, u16), _V29(u16, $param), _V2a($param, u16), _V2b(u16, $param),
_V2c($param, u16), _V2d(u16, $param), _V2e($param, u16), _V2f(u16, $param),
_V30($param, u16), _V31(u16, $param), _V32($param, u16), _V33(u16, $param),
_V34($param, u16), _V35(u16, $param), _V36($param, u16), _V37(u16, $param),
_V38($param, u16), _V39(u16, $param), _V3a($param, u16), _V3b(u16, $param),
_V3c($param, u16), _V3d(u16, $param), _V3e($param, u16), _V3f(u16, $param),
_V40($param, u16), _V41(u16, $param), _V42($param, u16), _V43(u16, $param),
_V44($param, u16), _V45(u16, $param), _V46($param, u16), _V47(u16, $param),
_V48($param, u16), _V49(u16, $param), _V4a($param, u16), _V4b(u16, $param),
_V4c($param, u16), _V4d(u16, $param), _V4e($param, u16), _V4f(u16, $param),
_V50($param, u16), _V51(u16, $param), _V52($param, u16), _V53(u16, $param),
_V54($param, u16), _V55(u16, $param), _V56($param, u16), _V57(u16, $param),
_V58($param, u16), _V59(u16, $param), _V5a($param, u16), _V5b(u16, $param),
_V5c($param, u16), _V5d(u16, $param), _V5e($param, u16), _V5f(u16, $param),
_V60($param, u16), _V61(u16, $param), _V62($param, u16), _V63(u16, $param),
_V64($param, u16), _V65(u16, $param), _V66($param, u16), _V67(u16, $param),
_V68($param, u16), _V69(u16, $param), _V6a($param, u16), _V6b(u16, $param),
_V6c($param, u16), _V6d(u16, $param), _V6e($param, u16), _V6f(u16, $param),
_V70($param, u16), _V71(u16, $param), _V72($param, u16), _V73(u16, $param),
_V74($param, u16), _V75(u16, $param), _V76($param, u16), _V77(u16, $param),
_V78($param, u16), _V79(u16, $param), _V7a($param, u16), _V7b(u16, $param),
_V7c($param, u16), _V7d(u16, $param), _V7e($param, u16), _V7f(u16, $param),
_V80($param, u16), _V81(u16, $param), _V82($param, u16), _V83(u16, $param),
_V84($param, u16), _V85(u16, $param), _V86($param, u16), _V87(u16, $param),
_V88($param, u16), _V89(u16, $param), _V8a($param, u16), _V8b(u16, $param),
_V8c($param, u16), _V8d(u16, $param), _V8e($param, u16), _V8f(u16, $param),
_V90($param, u16), _V91(u16, $param), _V92($param, u16), _V93(u16, $param),
_V94($param, u16), _V95(u16, $param), _V96($param, u16), _V97(u16, $param),
_V98($param, u16), _V99(u16, $param), _V9a($param, u16), _V9b(u16, $param),
_V9c($param, u16), _V9d(u16, $param), _V9e($param, u16), _V9f(u16, $param),
_Va0($param, u16), _Va1(u16, $param), _Va2($param, u16), _Va3(u16, $param),
_Va4($param, u16), _Va5(u16, $param), _Va6($param, u16), _Va7(u16, $param),
_Va8($param, u16), _Va9(u16, $param), _Vaa($param, u16), _Vab(u16, $param),
_Vac($param, u16), _Vad(u16, $param), _Vae($param, u16), _Vaf(u16, $param),
_Vb0($param, u16), _Vb1(u16, $param), _Vb2($param, u16), _Vb3(u16, $param),
_Vb4($param, u16), _Vb5(u16, $param), _Vb6($param, u16), _Vb7(u16, $param),
_Vb8($param, u16), _Vb9(u16, $param), _Vba($param, u16), _Vbb(u16, $param),
_Vbc($param, u16), _Vbd(u16, $param), _Vbe($param, u16), _Vbf(u16, $param),
_Vc0($param, u16), _Vc1(u16, $param), _Vc2($param, u16), _Vc3(u16, $param),
_Vc4($param, u16), _Vc5(u16, $param), _Vc6($param, u16), _Vc7(u16, $param),
_Vc8($param, u16), _Vc9(u16, $param), _Vca($param, u16), _Vcb(u16, $param),
_Vcc($param, u16), _Vcd(u16, $param), _Vce($param, u16), _Vcf(u16, $param),
_Vd0($param, u16), _Vd1(u16, $param), _Vd2($param, u16), _Vd3(u16, $param),
_Vd4($param, u16), _Vd5(u16, $param), _Vd6($param, u16), _Vd7(u16, $param),
_Vd8($param, u16), _Vd9(u16, $param), _Vda($param, u16), _Vdb(u16, $param),
_Vdc($param, u16), _Vdd(u16, $param), _Vde($param, u16), _Vdf(u16, $param),
_Ve0($param, u16), _Ve1(u16, $param), _Ve2($param, u16), _Ve3(u16, $param),
_Ve4($param, u16), _Ve5(u16, $param), _Ve6($param, u16), _Ve7(u16, $param),
_Ve8($param, u16), _Ve9(u16, $param), _Vea($param, u16), _Veb(u16, $param),
_Vec($param, u16), _Ved(u16, $param), _Vee($param, u16), _Vef(u16, $param),
_Vf0($param, u16), _Vf1(u16, $param), _Vf2($param, u16), _Vf3(u16, $param),
_Vf4($param, u16), _Vf5(u16, $param), _Vf6($param, u16), _Vf7(u16, $param),
_Vf8($param, u16), _Vf9(u16, $param), _Vfa($param, u16), _Vfb(u16, $param),
_Vfc($param, u16), _Vfd(u16, $param), _Vfe($param, u16), _Vff(u16, $param),
}
}
}

2
src/tools/clippy/clippy_lints/src/non_copy_const.rs
View file

@ -148,7 +148,7 @@ fn inner<'tcx>(cx: &LateContext<'tcx>, val: mir::ConstantKind<'tcx>) -> bool {
match val.ty().kind() { match val.ty().kind() {
// the fact that we have to dig into every structs to search enums // the fact that we have to dig into every structs to search enums
// leads us to the point checking `UnsafeCell` directly is the only option. // leads us to the point checking `UnsafeCell` directly is the only option.
ty::Adt(ty_def, ..) if Some(ty_def.did()) == cx.tcx.lang_items().unsafe_cell_type() => true, ty::Adt(ty_def, ..) if ty_def.is_unsafe_cell() => true,
ty::Array(..) | ty::Adt(..) | ty::Tuple(..) => { ty::Array(..) | ty::Adt(..) | ty::Tuple(..) => {
let val = cx.tcx.destructure_mir_constant(cx.param_env, val); let val = cx.tcx.destructure_mir_constant(cx.param_env, val);
val.fields.iter().any(|field| inner(cx, *field)) val.fields.iter().any(|field| inner(cx, *field))