nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 15:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #78439 - lzutao:rm-clouldabi, r=Mark-Simulacrum

Browse Source 
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
This commit is contained in:
bors 2020-11-23 19:01:19 +00:00
commit e5fddb6747
4 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/attrs.rs
View File

@ -40,7 +40,7 @@ static UNIX_SYSTEMS: &[&str] = &[
]; ];
// NOTE: windows is excluded from the list because it's also a valid target family. // NOTE: windows is excluded from the list because it's also a valid target family.
static NON_UNIX_SYSTEMS: &[&str] = &["cloudabi", "hermit", "none", "wasi"]; static NON_UNIX_SYSTEMS: &[&str] = &["hermit", "none", "wasi"];
declare_clippy_lint! { declare_clippy_lint! {
/// **What it does:** Checks for items annotated with `#[inline(always)]`, /// **What it does:** Checks for items annotated with `#[inline(always)]`,

5
tests/ui/mismatched_target_os_non_unix.fixed
View File

@ -3,9 +3,6 @@
#![warn(clippy::mismatched_target_os)] #![warn(clippy::mismatched_target_os)]
#![allow(unused)] #![allow(unused)]
#[cfg(target_os = "cloudabi")]
fn cloudabi() {}
#[cfg(target_os = "hermit")] #[cfg(target_os = "hermit")]
fn hermit() {} fn hermit() {}
@ -16,7 +13,7 @@ fn wasi() {}
fn none() {} fn none() {}
// list with conditions // list with conditions
#[cfg(all(not(any(windows, target_os = "cloudabi")), target_os = "wasi"))] #[cfg(all(not(windows), target_os = "wasi"))]
fn list() {} fn list() {}
// windows is a valid target family, should be ignored // windows is a valid target family, should be ignored

5
tests/ui/mismatched_target_os_non_unix.rs
View File

@ -3,9 +3,6 @@
#![warn(clippy::mismatched_target_os)] #![warn(clippy::mismatched_target_os)]
#![allow(unused)] #![allow(unused)]
#[cfg(cloudabi)]
fn cloudabi() {}
#[cfg(hermit)] #[cfg(hermit)]
fn hermit() {} fn hermit() {}
@ -16,7 +13,7 @@ fn wasi() {}
fn none() {} fn none() {}
// list with conditions // list with conditions
#[cfg(all(not(any(windows, cloudabi)), wasi))] #[cfg(all(not(windows), wasi))]
fn list() {} fn list() {}
// windows is a valid target family, should be ignored // windows is a valid target family, should be ignored

35
tests/ui/mismatched_target_os_non_unix.stderr
View File

@ -1,23 +1,15 @@
error: operating system used in target family position error: operating system used in target family position
--> $DIR/mismatched_target_os_non_unix.rs:6:1 --> $DIR/mismatched_target_os_non_unix.rs:6:1
| |
LL | #[cfg(cloudabi)]
| ^^^^^^--------^^
| |
| help: try: `target_os = "cloudabi"`
|
= note: `-D clippy::mismatched-target-os` implied by `-D warnings`
error: operating system used in target family position
--> $DIR/mismatched_target_os_non_unix.rs:9:1
|
LL | #[cfg(hermit)] LL | #[cfg(hermit)]
| ^^^^^^------^^ | ^^^^^^------^^
| | | |
| help: try: `target_os = "hermit"` | help: try: `target_os = "hermit"`
|
= note: `-D clippy::mismatched-target-os` implied by `-D warnings`
error: operating system used in target family position error: operating system used in target family position
--> $DIR/mismatched_target_os_non_unix.rs:12:1 --> $DIR/mismatched_target_os_non_unix.rs:9:1
| |
LL | #[cfg(wasi)] LL | #[cfg(wasi)]
| ^^^^^^----^^ | ^^^^^^----^^
@ -25,7 +17,7 @@ LL | #[cfg(wasi)]
| help: try: `target_os = "wasi"` | help: try: `target_os = "wasi"`
error: operating system used in target family position error: operating system used in target family position
--> $DIR/mismatched_target_os_non_unix.rs:15:1 --> $DIR/mismatched_target_os_non_unix.rs:12:1
| |
LL | #[cfg(none)] LL | #[cfg(none)]
| ^^^^^^----^^ | ^^^^^^----^^
@ -33,19 +25,12 @@ LL | #[cfg(none)]
| help: try: `target_os = "none"` | help: try: `target_os = "none"`
error: operating system used in target family position error: operating system used in target family position
--> $DIR/mismatched_target_os_non_unix.rs:19:1 --> $DIR/mismatched_target_os_non_unix.rs:16:1
| |
LL | #[cfg(all(not(any(windows, cloudabi)), wasi))] LL | #[cfg(all(not(windows), wasi))]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^----^^^
| | |
help: try | help: try: `target_os = "wasi"`
|
LL | #[cfg(all(not(any(windows, target_os = "cloudabi")), wasi))]
| ^^^^^^^^^^^^^^^^^^^^^^
help: try
|
LL | #[cfg(all(not(any(windows, cloudabi)), target_os = "wasi"))]
| ^^^^^^^^^^^^^^^^^^
error: aborting due to 5 previous errors error: aborting due to 4 previous errors