OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #6371 - ebroto:rustup, r=ebroto

Browse Source 
Rustup

changelog: none

r? `@ghost`
This commit is contained in:
bors 2020-11-23 22:05:39 +00:00
commit 51b633b1ad
5 changed files with 14 additions and 35 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.
static NON_UNIX_SYSTEMS: &[&str] = &["cloudabi", "hermit", "none", "wasi"];
static NON_UNIX_SYSTEMS: &[&str] = &["hermit", "none", "wasi"];
declare_clippy_lint! {
/// **What it does:** Checks for items annotated with `#[inline(always)]`,

2
clippy_lints/src/future_not_send.rs
View File

@ -68,7 +68,7 @@ impl<'tcx> LateLintPass<'tcx> for FutureNotSend {
for &(p, _span) in preds {
let p = p.subst(cx.tcx, subst);
if let Some(trait_ref) = p.to_opt_poly_trait_ref() {
if Some(trait_ref.def_id()) == cx.tcx.lang_items().future_trait() {
if Some(trait_ref.value.def_id()) == cx.tcx.lang_items().future_trait() {
is_future = true;
break;
}

5
tests/ui/mismatched_target_os_non_unix.fixed
View File

@ -3,9 +3,6 @@
#![warn(clippy::mismatched_target_os)]
#![allow(unused)]
#[cfg(target_os = "cloudabi")]
fn cloudabi() {}
#[cfg(target_os = "hermit")]
fn hermit() {}
@ -16,7 +13,7 @@ fn wasi() {}
fn none() {}
// list with conditions
#[cfg(all(not(any(windows, target_os = "cloudabi")), target_os = "wasi"))]
#[cfg(all(not(windows), target_os = "wasi"))]
fn list() {}
// 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)]
#![allow(unused)]
#[cfg(cloudabi)]
fn cloudabi() {}
#[cfg(hermit)]
fn hermit() {}
@ -16,7 +13,7 @@ fn wasi() {}
fn none() {}
// list with conditions
#[cfg(all(not(any(windows, cloudabi)), wasi))]
#[cfg(all(not(windows), wasi))]
fn list() {}
// 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
--> $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)]
| ^^^^^^------^^
| |
| help: try: `target_os = "hermit"`
|
= 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:12:1
--> $DIR/mismatched_target_os_non_unix.rs:9:1
|
LL | #[cfg(wasi)]
| ^^^^^^----^^
@ -25,7 +17,7 @@ LL | #[cfg(wasi)]
| help: try: `target_os = "wasi"`
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)]
| ^^^^^^----^^
@ -33,19 +25,12 @@ LL | #[cfg(none)]
| help: try: `target_os = "none"`
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))]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: try
|
LL | #[cfg(all(not(any(windows, target_os = "cloudabi")), wasi))]
| ^^^^^^^^^^^^^^^^^^^^^^
help: try
|
LL | #[cfg(all(not(any(windows, cloudabi)), target_os = "wasi"))]
| ^^^^^^^^^^^^^^^^^^
LL | #[cfg(all(not(windows), wasi))]
| ^^^^^^^^^^^^^^^^^^^^^^^^----^^^
| |
| help: try: `target_os = "wasi"`
error: aborting due to 5 previous errors
error: aborting due to 4 previous errors