diff options
| author | bors <bors@rust-lang.org> | 2019-11-14 11:06:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-14 11:06:41 +0000 |
| commit | d63b24ffcc48f44ef09e0369e6516d6f2dec3520 (patch) | |
| tree | 2ce7e283ffe112439fcf06d0641e418af5cfb0f0 /src/libstd/sys | |
| parent | a2491ee4e6c74451371aee8f4a2a5786d7a35406 (diff) | |
| parent | a1f67ad9490eaa7de7e43e3eda6ca38d14cc2ceb (diff) | |
| download | rust-d63b24ffcc48f44ef09e0369e6516d6f2dec3520.tar.gz rust-d63b24ffcc48f44ef09e0369e6516d6f2dec3520.zip | |
Auto merge of #66378 - rkruppe:revert-pr-65134, r=pnkfelix
Revert #65134 To stop giving people on nightly reasons to `allow(improper_ctypes)` while tweaks to the lint are being prepared. cc #66220
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/sgx/abi/mod.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/sgx/rwlock.rs | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/sys/sgx/abi/mod.rs b/src/libstd/sys/sgx/abi/mod.rs index 3a9b1fc8684..0f107de83f0 100644 --- a/src/libstd/sys/sgx/abi/mod.rs +++ b/src/libstd/sys/sgx/abi/mod.rs @@ -53,7 +53,6 @@ unsafe extern "C" fn tcs_init(secondary: bool) { // (main function exists). If this is a library, the crate author should be // able to specify this #[cfg(not(test))] -#[allow(improper_ctypes)] #[no_mangle] extern "C" fn entry(p1: u64, p2: u64, p3: u64, secondary: bool, p4: u64, p5: u64) -> (u64, u64) { // FIXME: how to support TLS in library mode? diff --git a/src/libstd/sys/sgx/rwlock.rs b/src/libstd/sys/sgx/rwlock.rs index c32e6dd3786..e2f94b1d928 100644 --- a/src/libstd/sys/sgx/rwlock.rs +++ b/src/libstd/sys/sgx/rwlock.rs @@ -172,7 +172,6 @@ const EINVAL: i32 = 22; #[cfg(not(test))] #[no_mangle] -#[allow(improper_ctypes)] pub unsafe extern "C" fn __rust_rwlock_rdlock(p: *mut RWLock) -> i32 { if p.is_null() { return EINVAL; @@ -182,7 +181,6 @@ pub unsafe extern "C" fn __rust_rwlock_rdlock(p: *mut RWLock) -> i32 { } #[cfg(not(test))] -#[allow(improper_ctypes)] #[no_mangle] pub unsafe extern "C" fn __rust_rwlock_wrlock(p: *mut RWLock) -> i32 { if p.is_null() { @@ -192,7 +190,6 @@ pub unsafe extern "C" fn __rust_rwlock_wrlock(p: *mut RWLock) -> i32 { return 0; } #[cfg(not(test))] -#[allow(improper_ctypes)] #[no_mangle] pub unsafe extern "C" fn __rust_rwlock_unlock(p: *mut RWLock) -> i32 { if p.is_null() { |