Skip to content

Commit

Permalink
Fixup a few tests needing asm support
Browse files Browse the repository at this point in the history
  • Loading branch information
cuviper committed Oct 19, 2022
1 parent a24a020 commit f8e157b
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 49 deletions.
1 change: 1 addition & 0 deletions compiler/rustc_lint/src/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3176,6 +3176,7 @@ declare_lint! {
/// ### Example
///
/// ```rust,compile_fail
/// # #![feature(asm_experimental_arch)]
/// use std::arch::asm;
///
/// fn main() {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_lint_defs/src/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2878,7 +2878,7 @@ declare_lint! {
/// ### Example
///
/// ```rust
/// #![feature(naked_functions)]
/// #![feature(asm_experimental_arch, naked_functions)]
///
/// use std::arch::asm;
///
Expand Down
1 change: 1 addition & 0 deletions src/test/pretty/raw-str-nonexpr.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// needs-asm-support
// pp-exact

#[cfg(foo = r#"just parse this"#)]
Expand Down
1 change: 1 addition & 0 deletions src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include ../tools.mk

# needs-asm-support
# ignore-windows-msvc
#
# Because of Windows exception handling, the code is not necessarily any shorter.
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm/unpretty-expanded.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// needs-asm-support
// check-pass
// compile-flags: -Zunpretty=expanded
core::arch::global_asm!("x: .byte 42");
1 change: 1 addition & 0 deletions src/test/ui/asm/unpretty-expanded.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
// needs-asm-support
// check-pass
// compile-flags: -Zunpretty=expanded
global_asm! ("x: .byte 42");
15 changes: 1 addition & 14 deletions src/test/ui/empty_global_asm.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
// needs-asm-support
// run-pass

#[allow(unused_imports)]
use std::arch::global_asm;

#[cfg(target_arch = "x86")]
global_asm!("");

#[cfg(target_arch = "x86_64")]
global_asm!("");

#[cfg(target_arch = "arm")]
global_asm!("");

#[cfg(target_arch = "aarch64")]
global_asm!("");

#[cfg(target_arch = "mips")]
global_asm!("");

fn main() {}
1 change: 1 addition & 0 deletions src/tools/clippy/tests/ui/entry.fixed
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// needs-asm-support
// run-rustfix

#![allow(unused, clippy::needless_pass_by_value, clippy::collapsible_if)]
Expand Down
1 change: 1 addition & 0 deletions src/tools/clippy/tests/ui/entry.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// needs-asm-support
// run-rustfix

#![allow(unused, clippy::needless_pass_by_value, clippy::collapsible_if)]
Expand Down
20 changes: 10 additions & 10 deletions src/tools/clippy/tests/ui/entry.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:24:5
--> $DIR/entry.rs:25:5
|
LL | / if !m.contains_key(&k) {
LL | | m.insert(k, v);
Expand All @@ -9,7 +9,7 @@ LL | | }
= note: `-D clippy::map-entry` implied by `-D warnings`

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:29:5
--> $DIR/entry.rs:30:5
|
LL | / if !m.contains_key(&k) {
LL | | if true {
Expand All @@ -32,7 +32,7 @@ LL + });
|

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:38:5
--> $DIR/entry.rs:39:5
|
LL | / if !m.contains_key(&k) {
LL | | if true {
Expand All @@ -55,7 +55,7 @@ LL + });
|

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:47:5
--> $DIR/entry.rs:48:5
|
LL | / if !m.contains_key(&k) {
LL | | if true {
Expand All @@ -79,7 +79,7 @@ LL + }
|

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:57:5
--> $DIR/entry.rs:58:5
|
LL | / if !m.contains_key(&k) {
LL | | foo();
Expand All @@ -96,7 +96,7 @@ LL + });
|

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:63:5
--> $DIR/entry.rs:64:5
|
LL | / if !m.contains_key(&k) {
LL | | match 0 {
Expand All @@ -122,7 +122,7 @@ LL + });
|

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:75:5
--> $DIR/entry.rs:76:5
|
LL | / if !m.contains_key(&k) {
LL | | match 0 {
Expand All @@ -146,7 +146,7 @@ LL + }
|

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:85:5
--> $DIR/entry.rs:86:5
|
LL | / if !m.contains_key(&k) {
LL | | foo();
Expand Down Expand Up @@ -187,15 +187,15 @@ LL + });
|

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:119:5
--> $DIR/entry.rs:120:5
|
LL | / if !m.contains_key(&m!(k)) {
LL | | m.insert(m!(k), m!(v));
LL | | }
| |_____^ help: try this: `m.entry(m!(k)).or_insert_with(|| m!(v));`

error: usage of `contains_key` followed by `insert` on a `HashMap`
--> $DIR/entry.rs:151:5
--> $DIR/entry.rs:152:5
|
LL | / if !m.contains_key(&k) {
LL | | let x = (String::new(), String::new());
Expand Down
1 change: 1 addition & 0 deletions src/tools/clippy/tests/ui/missing_doc.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// needs-asm-support
// aux-build: proc_macro_with_span.rs

#![warn(clippy::missing_docs_in_private_items)]
Expand Down
48 changes: 24 additions & 24 deletions src/tools/clippy/tests/ui/missing_doc.stderr
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
error: missing documentation for a type alias
--> $DIR/missing_doc.rs:15:1
--> $DIR/missing_doc.rs:16:1
|
LL | type Typedef = String;
| ^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::missing-docs-in-private-items` implied by `-D warnings`

error: missing documentation for a type alias
--> $DIR/missing_doc.rs:16:1
--> $DIR/missing_doc.rs:17:1
|
LL | pub type PubTypedef = String;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a module
--> $DIR/missing_doc.rs:18:1
--> $DIR/missing_doc.rs:19:1
|
LL | mod module_no_dox {}
| ^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a module
--> $DIR/missing_doc.rs:19:1
--> $DIR/missing_doc.rs:20:1
|
LL | pub mod pub_module_no_dox {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a function
--> $DIR/missing_doc.rs:23:1
--> $DIR/missing_doc.rs:24:1
|
LL | pub fn foo2() {}
| ^^^^^^^^^^^^^^^^

error: missing documentation for a function
--> $DIR/missing_doc.rs:24:1
--> $DIR/missing_doc.rs:25:1
|
LL | fn foo3() {}
| ^^^^^^^^^^^^

error: missing documentation for an enum
--> $DIR/missing_doc.rs:38:1
--> $DIR/missing_doc.rs:39:1
|
LL | / enum Baz {
LL | | BazA { a: isize, b: isize },
Expand All @@ -46,75 +46,75 @@ LL | | }
| |_^

error: missing documentation for a variant
--> $DIR/missing_doc.rs:39:5
--> $DIR/missing_doc.rs:40:5
|
LL | BazA { a: isize, b: isize },
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a struct field
--> $DIR/missing_doc.rs:39:12
--> $DIR/missing_doc.rs:40:12
|
LL | BazA { a: isize, b: isize },
| ^^^^^^^^

error: missing documentation for a struct field
--> $DIR/missing_doc.rs:39:22
--> $DIR/missing_doc.rs:40:22
|
LL | BazA { a: isize, b: isize },
| ^^^^^^^^

error: missing documentation for a variant
--> $DIR/missing_doc.rs:40:5
--> $DIR/missing_doc.rs:41:5
|
LL | BarB,
| ^^^^

error: missing documentation for an enum
--> $DIR/missing_doc.rs:43:1
--> $DIR/missing_doc.rs:44:1
|
LL | / pub enum PubBaz {
LL | | PubBazA { a: isize },
LL | | }
| |_^

error: missing documentation for a variant
--> $DIR/missing_doc.rs:44:5
--> $DIR/missing_doc.rs:45:5
|
LL | PubBazA { a: isize },
| ^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a struct field
--> $DIR/missing_doc.rs:44:15
--> $DIR/missing_doc.rs:45:15
|
LL | PubBazA { a: isize },
| ^^^^^^^^

error: missing documentation for a constant
--> $DIR/missing_doc.rs:64:1
--> $DIR/missing_doc.rs:65:1
|
LL | const FOO: u32 = 0;
| ^^^^^^^^^^^^^^^^^^^

error: missing documentation for a constant
--> $DIR/missing_doc.rs:71:1
--> $DIR/missing_doc.rs:72:1
|
LL | pub const FOO4: u32 = 0;
| ^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a static
--> $DIR/missing_doc.rs:73:1
--> $DIR/missing_doc.rs:74:1
|
LL | static BAR: u32 = 0;
| ^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a static
--> $DIR/missing_doc.rs:80:1
--> $DIR/missing_doc.rs:81:1
|
LL | pub static BAR4: u32 = 0;
| ^^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a module
--> $DIR/missing_doc.rs:82:1
--> $DIR/missing_doc.rs:83:1
|
LL | / mod internal_impl {
LL | | /// dox
Expand All @@ -126,31 +126,31 @@ LL | | }
| |_^

error: missing documentation for a function
--> $DIR/missing_doc.rs:85:5
--> $DIR/missing_doc.rs:86:5
|
LL | pub fn undocumented1() {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a function
--> $DIR/missing_doc.rs:86:5
--> $DIR/missing_doc.rs:87:5
|
LL | pub fn undocumented2() {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a function
--> $DIR/missing_doc.rs:87:5
--> $DIR/missing_doc.rs:88:5
|
LL | fn undocumented3() {}
| ^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a function
--> $DIR/missing_doc.rs:92:9
--> $DIR/missing_doc.rs:93:9
|
LL | pub fn also_undocumented1() {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: missing documentation for a function
--> $DIR/missing_doc.rs:93:9
--> $DIR/missing_doc.rs:94:9
|
LL | fn also_undocumented2() {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit f8e157b

Please sign in to comment.