Skip to content

Commit

Permalink
Unrolled build for rust-lang#130953
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#130953 - workingjubilee:rename-a-few-ctypes-tests, r=fee1-dead

Rename a few tests to make tidy happier

A somewhat random smattering of tests that I have recently looked at, and thus had cause to research and write down the reason for their existence.
  • Loading branch information
rust-timer authored Sep 28, 2024
2 parents 150247c + 19d5568 commit 497274d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
3 changes: 0 additions & 3 deletions src/tools/tidy/src/issues.txt
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,6 @@ ui/consts/issue-68684.rs
ui/consts/issue-69191-ice-on-uninhabited-enum-field.rs
ui/consts/issue-69310-array-size-lit-wrong-ty.rs
ui/consts/issue-69312.rs
ui/consts/issue-69488.rs
ui/consts/issue-69532.rs
ui/consts/issue-6991.rs
ui/consts/issue-70773-mir-typeck-lt-norm.rs
Expand Down Expand Up @@ -2745,14 +2744,12 @@ ui/lint/issue-111359.rs
ui/lint/issue-112489.rs
ui/lint/issue-117949.rs
ui/lint/issue-121070-let-range.rs
ui/lint/issue-14309.rs
ui/lint/issue-14837.rs
ui/lint/issue-17718-const-naming.rs
ui/lint/issue-1866.rs
ui/lint/issue-19102.rs
ui/lint/issue-20343.rs
ui/lint/issue-30302.rs
ui/lint/issue-34798.rs
ui/lint/issue-35075.rs
ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
ui/lint/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
//@ run-pass

#![feature(const_ptr_write)]
// issue: https://github.com/rust-lang/rust/issues/69488
// Loads of partially-initialized data could produce completely-uninitialized results.
// Test to make sure that we no longer do such a "deinitializing" load.

// Or, equivalently: `MaybeUninit`.
pub union BagOfBits<T: Copy> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//@ run-pass
#![forbid(improper_ctypes)]
#![allow(dead_code)]
// issue https://github.com/rust-lang/rust/issues/34798
// We allow PhantomData in FFI so bindgen can bind templated C++ structs with "unused generic args"

#[repr(C)]
pub struct Foo {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#![deny(improper_ctypes)]
#![allow(dead_code)]

// issue https://github.com/rust-lang/rust/issues/14309
// Validates we lint on repr(Rust) structs and not repr(C) structs in FFI, to implement RFC 79:
// https://rust-lang.github.io/rfcs/0079-undefined-struct-layout.html

struct A {
x: i32
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:30:15
--> $DIR/repr-rust-is-undefined.rs:34:15
|
LL | fn foo(x: A);
| ^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
= note: this struct has unspecified layout
note: the type is defined here
--> $DIR/issue-14309.rs:4:1
--> $DIR/repr-rust-is-undefined.rs:8:1
|
LL | struct A {
| ^^^^^^^^
note: the lint level is defined here
--> $DIR/issue-14309.rs:1:9
--> $DIR/repr-rust-is-undefined.rs:1:9
|
LL | #![deny(improper_ctypes)]
| ^^^^^^^^^^^^^^^

error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:31:15
--> $DIR/repr-rust-is-undefined.rs:35:15
|
LL | fn bar(x: B);
| ^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
= note: this struct has unspecified layout
note: the type is defined here
--> $DIR/issue-14309.rs:4:1
--> $DIR/repr-rust-is-undefined.rs:8:1
|
LL | struct A {
| ^^^^^^^^

error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:33:15
--> $DIR/repr-rust-is-undefined.rs:37:15
|
LL | fn qux(x: A2);
| ^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
= note: this struct has unspecified layout
note: the type is defined here
--> $DIR/issue-14309.rs:4:1
--> $DIR/repr-rust-is-undefined.rs:8:1
|
LL | struct A {
| ^^^^^^^^

error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:34:16
--> $DIR/repr-rust-is-undefined.rs:38:16
|
LL | fn quux(x: B2);
| ^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
= note: this struct has unspecified layout
note: the type is defined here
--> $DIR/issue-14309.rs:4:1
--> $DIR/repr-rust-is-undefined.rs:8:1
|
LL | struct A {
| ^^^^^^^^

error: `extern` block uses type `A`, which is not FFI-safe
--> $DIR/issue-14309.rs:36:16
--> $DIR/repr-rust-is-undefined.rs:40:16
|
LL | fn fred(x: D);
| ^ not FFI-safe
|
= help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
= note: this struct has unspecified layout
note: the type is defined here
--> $DIR/issue-14309.rs:4:1
--> $DIR/repr-rust-is-undefined.rs:8:1
|
LL | struct A {
| ^^^^^^^^
Expand Down

0 comments on commit 497274d

Please sign in to comment.