Skip to content

Commit

Permalink
Update ui tests
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeGomez committed Feb 8, 2024
1 parent 56b1b24 commit 6374508
Show file tree
Hide file tree
Showing 48 changed files with 244 additions and 192 deletions.
2 changes: 1 addition & 1 deletion tests/ui/author/issue_3849.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![allow(dead_code)]
#![allow(clippy::zero_ptr)]
#![allow(clippy::transmute_ptr_to_ref)]
#![allow(clippy::transmuting_null)]
#![allow(clippy::transmuting_null, clippy::missing_transmute_annotations)]

pub const ZPTR: *const usize = 0 as *const _;

Expand Down
7 changes: 6 additions & 1 deletion tests/ui/blocks_in_conditions.fixed
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#![warn(clippy::blocks_in_conditions)]
#![allow(unused, clippy::let_and_return, clippy::needless_if)]
#![allow(
unused,
clippy::let_and_return,
clippy::needless_if,
clippy::missing_transmute_annotations
)]
#![warn(clippy::nonminimal_bool)]

macro_rules! blocky {
Expand Down
7 changes: 6 additions & 1 deletion tests/ui/blocks_in_conditions.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#![warn(clippy::blocks_in_conditions)]
#![allow(unused, clippy::let_and_return, clippy::needless_if)]
#![allow(
unused,
clippy::let_and_return,
clippy::needless_if,
clippy::missing_transmute_annotations
)]
#![warn(clippy::nonminimal_bool)]

macro_rules! blocky {
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/blocks_in_conditions.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: in an `if` condition, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a `let`
--> $DIR/blocks_in_conditions.rs:23:5
--> $DIR/blocks_in_conditions.rs:28:5
|
LL | / if {
LL | |
Expand All @@ -20,13 +20,13 @@ LL ~ }; if res {
|

error: omit braces around single expression condition
--> $DIR/blocks_in_conditions.rs:35:8
--> $DIR/blocks_in_conditions.rs:40:8
|
LL | if { true } { 6 } else { 10 }
| ^^^^^^^^ help: try: `true`

error: this boolean expression can be simplified
--> $DIR/blocks_in_conditions.rs:41:8
--> $DIR/blocks_in_conditions.rs:46:8
|
LL | if true && x == 3 { 6 } else { 10 }
| ^^^^^^^^^^^^^^ help: try: `x == 3`
Expand All @@ -35,7 +35,7 @@ LL | if true && x == 3 { 6 } else { 10 }
= help: to override `-D warnings` add `#[allow(clippy::nonminimal_bool)]`

error: in a `match` scrutinee, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a `let`
--> $DIR/blocks_in_conditions.rs:68:5
--> $DIR/blocks_in_conditions.rs:73:5
|
LL | / match {
LL | |
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/crashes/ice-1782.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(dead_code, unused_variables)]
#![allow(clippy::unnecessary_cast)]
#![allow(clippy::unnecessary_cast, clippy::missing_transmute_annotations)]

/// Should not trigger an ICE in `SpanlessEq` / `consts::constant`
///
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/crashes/ice-4968.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Test for https://github.com/rust-lang/rust-clippy/issues/4968

#![warn(clippy::unsound_collection_transmute)]
#![allow(clippy::transmute_undefined_repr)]
#![allow(clippy::transmute_undefined_repr, clippy::missing_transmute_annotations)]

trait Trait {
type Assoc;
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eager_transmute.fixed
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![feature(rustc_attrs)]
#![warn(clippy::eager_transmute)]
#![allow(clippy::transmute_int_to_non_zero)]
#![allow(clippy::transmute_int_to_non_zero, clippy::missing_transmute_annotations)]

use std::num::NonZeroU8;

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eager_transmute.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![feature(rustc_attrs)]
#![warn(clippy::eager_transmute)]
#![allow(clippy::transmute_int_to_non_zero)]
#![allow(clippy::transmute_int_to_non_zero, clippy::missing_transmute_annotations)]

use std::num::NonZeroU8;

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/missing_const_for_fn/could_be_const.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![warn(clippy::missing_const_for_fn)]
#![allow(incomplete_features, clippy::let_and_return)]
#![allow(incomplete_features, clippy::let_and_return, clippy::missing_transmute_annotations)]
#![feature(const_mut_refs)]
#![feature(const_trait_impl)]

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/missing_transmute_annotations.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![warn(clippy::missing_transmute_annotation)]
#![warn(clippy::missing_transmute_annotations)]

fn main() {
unsafe {
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/missing_transmute_annotations.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ error: transmute used without annotations
LL | let x: i32 = std::mem::transmute([1u16, 2u16]);
| ^^^^^^^^^ help: consider adding missing annotations with `transmute::<IN, OUT>`: `transmute::<[u16; 2], i32>`
|
= note: `-D clippy::missing-transmute-annotation` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::missing_transmute_annotation)]`
= note: `-D clippy::missing-transmute-annotations` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::missing_transmute_annotations)]`

error: transmute used without annotations
--> $DIR/missing_transmute_annotations.rs:7:32
Expand Down
7 changes: 6 additions & 1 deletion tests/ui/ptr_cast_constness.fixed
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
//@aux-build:proc_macros.rs

#![warn(clippy::ptr_cast_constness)]
#![allow(clippy::transmute_ptr_to_ref, clippy::unnecessary_cast, unused)]
#![allow(
clippy::transmute_ptr_to_ref,
clippy::unnecessary_cast,
unused,
clippy::missing_transmute_annotations
)]

extern crate proc_macros;
use proc_macros::{external, inline_macros};
Expand Down
7 changes: 6 additions & 1 deletion tests/ui/ptr_cast_constness.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
//@aux-build:proc_macros.rs

#![warn(clippy::ptr_cast_constness)]
#![allow(clippy::transmute_ptr_to_ref, clippy::unnecessary_cast, unused)]
#![allow(
clippy::transmute_ptr_to_ref,
clippy::unnecessary_cast,
unused,
clippy::missing_transmute_annotations
)]

extern crate proc_macros;
use proc_macros::{external, inline_macros};
Expand Down
14 changes: 7 additions & 7 deletions tests/ui/ptr_cast_constness.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `as` casting between raw pointers while changing only its constness
--> $DIR/ptr_cast_constness.rs:10:41
--> $DIR/ptr_cast_constness.rs:15:41
|
LL | let _: &mut T = std::mem::transmute(p as *mut T);
| ^^^^^^^^^^^ help: try `pointer::cast_mut`, a safer alternative: `p.cast_mut()`
Expand All @@ -8,37 +8,37 @@ LL | let _: &mut T = std::mem::transmute(p as *mut T);
= help: to override `-D warnings` add `#[allow(clippy::ptr_cast_constness)]`

error: `as` casting between raw pointers while changing only its constness
--> $DIR/ptr_cast_constness.rs:11:19
--> $DIR/ptr_cast_constness.rs:16:19
|
LL | let _ = &mut *(p as *mut T);
| ^^^^^^^^^^^^^ help: try `pointer::cast_mut`, a safer alternative: `p.cast_mut()`

error: `as` casting between raw pointers while changing only its constness
--> $DIR/ptr_cast_constness.rs:26:17
--> $DIR/ptr_cast_constness.rs:31:17
|
LL | let _ = *ptr_ptr as *mut u32;
| ^^^^^^^^^^^^^^^^^^^^ help: try `pointer::cast_mut`, a safer alternative: `(*ptr_ptr).cast_mut()`

error: `as` casting between raw pointers while changing only its constness
--> $DIR/ptr_cast_constness.rs:29:13
--> $DIR/ptr_cast_constness.rs:34:13
|
LL | let _ = ptr as *mut u32;
| ^^^^^^^^^^^^^^^ help: try `pointer::cast_mut`, a safer alternative: `ptr.cast_mut()`

error: `as` casting between raw pointers while changing only its constness
--> $DIR/ptr_cast_constness.rs:30:13
--> $DIR/ptr_cast_constness.rs:35:13
|
LL | let _ = mut_ptr as *const u32;
| ^^^^^^^^^^^^^^^^^^^^^ help: try `pointer::cast_const`, a safer alternative: `mut_ptr.cast_const()`

error: `as` casting between raw pointers while changing only its constness
--> $DIR/ptr_cast_constness.rs:59:13
--> $DIR/ptr_cast_constness.rs:64:13
|
LL | let _ = ptr as *mut u32;
| ^^^^^^^^^^^^^^^ help: try `pointer::cast_mut`, a safer alternative: `ptr.cast_mut()`

error: `as` casting between raw pointers while changing only its constness
--> $DIR/ptr_cast_constness.rs:60:13
--> $DIR/ptr_cast_constness.rs:65:13
|
LL | let _ = mut_ptr as *const u32;
| ^^^^^^^^^^^^^^^^^^^^^ help: try `pointer::cast_const`, a safer alternative: `mut_ptr.cast_const()`
Expand Down
7 changes: 6 additions & 1 deletion tests/ui/transmute.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#![allow(dead_code, clippy::borrow_as_ptr, clippy::needless_lifetimes)]
#![allow(
dead_code,
clippy::borrow_as_ptr,
clippy::needless_lifetimes,
clippy::missing_transmute_annotations
)]
//@no-rustfix
extern crate core;

Expand Down

0 comments on commit 6374508

Please sign in to comment.