Skip to content

Commit 08310f8

Browse files
committed
Auto merge of rust-lang#78439 - lzutao:rm-clouldabi, r=Mark-Simulacrum
Drop support for all cloudabi targets `cloudabi` is a tier-3 target, and [it is no longer being maintained upstream][no]. This PR drops supports for cloudabi targets. Those targets are: * aarch64-unknown-cloudabi * armv7-unknown-cloudabi * i686-unknown-cloudabi * x86_64-unknown-cloudabi Since this drops supports for a target, I'd like somebody to tag `relnotes` label to this PR. Some other issues: * The tidy exception for `cloudabi` crate is still remained because * `parking_lot v0.9.0` and `parking_lot v0.10.2` depends on `cloudabi v0.0.3`. * `parking_lot v0.11.0` depends on `cloudabi v0.1.0`. [no]: https://github.com/NuxiNL/cloudabi#note-this-project-is-unmaintained
2 parents c477795 + 3d75dd1 commit 08310f8

36 files changed

+11
-4942
lines changed

panic_abort/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 {
3232
abort();
3333

3434
cfg_if::cfg_if! {
35-
if #[cfg(any(unix, target_os = "cloudabi"))] {
35+
if #[cfg(unix)] {
3636
unsafe fn abort() -> ! {
3737
libc::abort();
3838
}

panic_unwind/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ cfg_if::cfg_if! {
4949
mod real_imp;
5050
} else if #[cfg(any(
5151
all(target_family = "windows", target_env = "gnu"),
52-
target_os = "cloudabi",
5352
target_os = "psp",
5453
target_family = "unix",
5554
all(target_vendor = "fortanix", target_env = "sgx"),

std/build.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ fn main() {
1818
|| target.contains("uwp")
1919
|| target.contains("windows")
2020
|| target.contains("fuchsia")
21-
|| target.contains("cloudabi")
2221
|| (target.contains("sgx") && target.contains("fortanix"))
2322
|| target.contains("hermit")
2423
|| target.contains("l4re")

std/src/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#![stable(feature = "rust1", since = "1.0.0")]
99
#![deny(unsafe_op_in_unsafe_fn)]
1010

11-
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten", target_env = "sgx"))))]
11+
#[cfg(all(test, not(any(target_os = "emscripten", target_env = "sgx"))))]
1212
mod tests;
1313

1414
use crate::ffi::OsString;

std/src/net/tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![deny(unsafe_op_in_unsafe_fn)]
22

3-
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))]
3+
#[cfg(all(test, not(target_os = "emscripten")))]
44
mod tests;
55

66
use crate::io::prelude::*;

std/src/net/udp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten", target_env = "sgx"))))]
1+
#[cfg(all(test, not(any(target_os = "emscripten", target_env = "sgx"))))]
22
mod tests;
33

44
use crate::fmt;

std/src/process.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
#![stable(feature = "process", since = "1.0.0")]
9898
#![deny(unsafe_op_in_unsafe_fn)]
9999

100-
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten", target_env = "sgx"))))]
100+
#[cfg(all(test, not(any(target_os = "emscripten", target_env = "sgx"))))]
101101
mod tests;
102102

103103
use crate::io::prelude::*;

std/src/sys/cloudabi/abi/bitflags.rs

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)