Skip to content

Commit 5b42a76

Browse files
borsbors
committed
Auto merge of #5099 - JohnTitor:split-up-non-copy-const, r=flip1995
Split up `non_copy_const` ui test Part of #2038 Maybe there is a better way to avoid duplications of constants. changelog: none
2 parents 5e722ba + 314f438 commit 5b42a76

5 files changed

+335
-300
lines changed

‎tests/ui/non_copy_const.rs ‎tests/ui/borrow_interior_mutable_const.rs

+5-65
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,33 @@
1-
#![allow(clippy::ref_in_deref, dead_code)]
1+
#![warn(clippy::borrow_interior_mutable_const)]
2+
#![allow(clippy::declare_interior_mutable_const, clippy::ref_in_deref)]
23

34
use std::borrow::Cow;
45
use std::cell::Cell;
56
use std::fmt::Display;
67
use std::sync::atomic::{AtomicUsize, Ordering};
78
use std::sync::Once;
89

9-
const ATOMIC: AtomicUsize = AtomicUsize::new(5); //~ ERROR interior mutable
10-
const CELL: Cell<usize> = Cell::new(6); //~ ERROR interior mutable
10+
const ATOMIC: AtomicUsize = AtomicUsize::new(5);
11+
const CELL: Cell<usize> = Cell::new(6);
1112
const ATOMIC_TUPLE: ([AtomicUsize; 1], Vec<AtomicUsize>, u8) = ([ATOMIC], Vec::new(), 7);
12-
//~^ ERROR interior mutable
13-
14-
macro_rules! declare_const {
15-
($name:ident: $ty:ty = $e:expr) => {
16-
const $name: $ty = $e;
17-
};
18-
}
19-
declare_const!(_ONCE: Once = Once::new()); //~ ERROR interior mutable
20-
21-
// const ATOMIC_REF: &AtomicUsize = &AtomicUsize::new(7); // This will simply trigger E0492.
22-
2313
const INTEGER: u8 = 8;
2414
const STRING: String = String::new();
2515
const STR: &str = "012345";
2616
const COW: Cow<str> = Cow::Borrowed("abcdef");
27-
//^ note: a const item of Cow is used in the `postgres` package.
28-
2917
const NO_ANN: &dyn Display = &70;
30-
3118
static STATIC_TUPLE: (AtomicUsize, String) = (ATOMIC, STRING);
32-
//^ there should be no lints on this line
33-
34-
#[allow(clippy::declare_interior_mutable_const)]
3519
const ONCE_INIT: Once = Once::new();
3620

3721
trait Trait<T>: Copy {
3822
type NonCopyType;
3923

40-
const ATOMIC: AtomicUsize; //~ ERROR interior mutable
41-
const INTEGER: u64;
42-
const STRING: String;
43-
const SELF: Self; // (no error)
44-
const INPUT: T;
45-
//~^ ERROR interior mutable
46-
//~| HELP consider requiring `T` to be `Copy`
47-
const ASSOC: Self::NonCopyType;
48-
//~^ ERROR interior mutable
49-
//~| HELP consider requiring `<Self as Trait<T>>::NonCopyType` to be `Copy`
50-
51-
const AN_INPUT: T = Self::INPUT;
52-
//~^ ERROR interior mutable
53-
//~| ERROR consider requiring `T` to be `Copy`
54-
declare_const!(ANOTHER_INPUT: T = Self::INPUT); //~ ERROR interior mutable
55-
}
56-
57-
trait Trait2 {
58-
type CopyType: Copy;
59-
60-
const SELF_2: Self;
61-
//~^ ERROR interior mutable
62-
//~| HELP consider requiring `Self` to be `Copy`
63-
const ASSOC_2: Self::CopyType; // (no error)
24+
const ATOMIC: AtomicUsize;
6425
}
6526

66-
// we don't lint impl of traits, because an impl has no power to change the interface.
6727
impl Trait<u32> for u64 {
6828
type NonCopyType = u16;
6929

7030
const ATOMIC: AtomicUsize = AtomicUsize::new(9);
71-
const INTEGER: u64 = 10;
72-
const STRING: String = String::new();
73-
const SELF: Self = 11;
74-
const INPUT: u32 = 12;
75-
const ASSOC: Self::NonCopyType = 13;
76-
}
77-
78-
struct Local<T, U>(T, U);
79-
80-
impl<T: Trait2 + Trait<u32>, U: Trait2> Local<T, U> {
81-
const ASSOC_3: AtomicUsize = AtomicUsize::new(14); //~ ERROR interior mutable
82-
const COW: Cow<'static, str> = Cow::Borrowed("tuvwxy");
83-
const T_SELF: T = T::SELF_2;
84-
const U_SELF: U = U::SELF_2;
85-
//~^ ERROR interior mutable
86-
//~| HELP consider requiring `U` to be `Copy`
87-
const T_ASSOC: T::NonCopyType = T::ASSOC;
88-
//~^ ERROR interior mutable
89-
//~| HELP consider requiring `<T as Trait<u32>>::NonCopyType` to be `Copy`
90-
const U_ASSOC: U::CopyType = U::ASSOC_2;
9131
}
9232

9333
fn main() {

‎tests/ui/borrow_interior_mutable_const.stderr

+131
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
error: a `const` item with interior mutability should not be borrowed
2+
--> $DIR/borrow_interior_mutable_const.rs:34:5
3+
|
4+
LL | ATOMIC.store(1, Ordering::SeqCst); //~ ERROR interior mutability
5+
| ^^^^^^
6+
|
7+
= note: `-D clippy::borrow-interior-mutable-const` implied by `-D warnings`
8+
= help: assign this const to a local or static variable, and use the variable here
9+
10+
error: a `const` item with interior mutability should not be borrowed
11+
--> $DIR/borrow_interior_mutable_const.rs:35:16
12+
|
13+
LL | assert_eq!(ATOMIC.load(Ordering::SeqCst), 5); //~ ERROR interior mutability
14+
| ^^^^^^
15+
|
16+
= help: assign this const to a local or static variable, and use the variable here
17+
18+
error: a `const` item with interior mutability should not be borrowed
19+
--> $DIR/borrow_interior_mutable_const.rs:38:22
20+
|
21+
LL | let _once_ref = &ONCE_INIT; //~ ERROR interior mutability
22+
| ^^^^^^^^^
23+
|
24+
= help: assign this const to a local or static variable, and use the variable here
25+
26+
error: a `const` item with interior mutability should not be borrowed
27+
--> $DIR/borrow_interior_mutable_const.rs:39:25
28+
|
29+
LL | let _once_ref_2 = &&ONCE_INIT; //~ ERROR interior mutability
30+
| ^^^^^^^^^
31+
|
32+
= help: assign this const to a local or static variable, and use the variable here
33+
34+
error: a `const` item with interior mutability should not be borrowed
35+
--> $DIR/borrow_interior_mutable_const.rs:40:27
36+
|
37+
LL | let _once_ref_4 = &&&&ONCE_INIT; //~ ERROR interior mutability
38+
| ^^^^^^^^^
39+
|
40+
= help: assign this const to a local or static variable, and use the variable here
41+
42+
error: a `const` item with interior mutability should not be borrowed
43+
--> $DIR/borrow_interior_mutable_const.rs:41:26
44+
|
45+
LL | let _once_mut = &mut ONCE_INIT; //~ ERROR interior mutability
46+
| ^^^^^^^^^
47+
|
48+
= help: assign this const to a local or static variable, and use the variable here
49+
50+
error: a `const` item with interior mutability should not be borrowed
51+
--> $DIR/borrow_interior_mutable_const.rs:52:14
52+
|
53+
LL | let _ = &ATOMIC_TUPLE; //~ ERROR interior mutability
54+
| ^^^^^^^^^^^^
55+
|
56+
= help: assign this const to a local or static variable, and use the variable here
57+
58+
error: a `const` item with interior mutability should not be borrowed
59+
--> $DIR/borrow_interior_mutable_const.rs:53:14
60+
|
61+
LL | let _ = &ATOMIC_TUPLE.0; //~ ERROR interior mutability
62+
| ^^^^^^^^^^^^
63+
|
64+
= help: assign this const to a local or static variable, and use the variable here
65+
66+
error: a `const` item with interior mutability should not be borrowed
67+
--> $DIR/borrow_interior_mutable_const.rs:54:19
68+
|
69+
LL | let _ = &(&&&&ATOMIC_TUPLE).0; //~ ERROR interior mutability
70+
| ^^^^^^^^^^^^
71+
|
72+
= help: assign this const to a local or static variable, and use the variable here
73+
74+
error: a `const` item with interior mutability should not be borrowed
75+
--> $DIR/borrow_interior_mutable_const.rs:55:14
76+
|
77+
LL | let _ = &ATOMIC_TUPLE.0[0]; //~ ERROR interior mutability
78+
| ^^^^^^^^^^^^
79+
|
80+
= help: assign this const to a local or static variable, and use the variable here
81+
82+
error: a `const` item with interior mutability should not be borrowed
83+
--> $DIR/borrow_interior_mutable_const.rs:56:13
84+
|
85+
LL | let _ = ATOMIC_TUPLE.0[0].load(Ordering::SeqCst); //~ ERROR interior mutability
86+
| ^^^^^^^^^^^^
87+
|
88+
= help: assign this const to a local or static variable, and use the variable here
89+
90+
error: a `const` item with interior mutability should not be borrowed
91+
--> $DIR/borrow_interior_mutable_const.rs:62:13
92+
|
93+
LL | let _ = ATOMIC_TUPLE.0[0]; //~ ERROR interior mutability
94+
| ^^^^^^^^^^^^
95+
|
96+
= help: assign this const to a local or static variable, and use the variable here
97+
98+
error: a `const` item with interior mutability should not be borrowed
99+
--> $DIR/borrow_interior_mutable_const.rs:67:5
100+
|
101+
LL | CELL.set(2); //~ ERROR interior mutability
102+
| ^^^^
103+
|
104+
= help: assign this const to a local or static variable, and use the variable here
105+
106+
error: a `const` item with interior mutability should not be borrowed
107+
--> $DIR/borrow_interior_mutable_const.rs:68:16
108+
|
109+
LL | assert_eq!(CELL.get(), 6); //~ ERROR interior mutability
110+
| ^^^^
111+
|
112+
= help: assign this const to a local or static variable, and use the variable here
113+
114+
error: a `const` item with interior mutability should not be borrowed
115+
--> $DIR/borrow_interior_mutable_const.rs:81:5
116+
|
117+
LL | u64::ATOMIC.store(5, Ordering::SeqCst); //~ ERROR interior mutability
118+
| ^^^^^^^^^^^
119+
|
120+
= help: assign this const to a local or static variable, and use the variable here
121+
122+
error: a `const` item with interior mutability should not be borrowed
123+
--> $DIR/borrow_interior_mutable_const.rs:82:16
124+
|
125+
LL | assert_eq!(u64::ATOMIC.load(Ordering::SeqCst), 9); //~ ERROR interior mutability
126+
| ^^^^^^^^^^^
127+
|
128+
= help: assign this const to a local or static variable, and use the variable here
129+
130+
error: aborting due to 16 previous errors
131+

‎tests/ui/declare_interior_mutable_const.rs

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#![warn(clippy::declare_interior_mutable_const)]
2+
3+
use std::borrow::Cow;
4+
use std::cell::Cell;
5+
use std::fmt::Display;
6+
use std::sync::atomic::AtomicUsize;
7+
use std::sync::Once;
8+
9+
const ATOMIC: AtomicUsize = AtomicUsize::new(5); //~ ERROR interior mutable
10+
const CELL: Cell<usize> = Cell::new(6); //~ ERROR interior mutable
11+
const ATOMIC_TUPLE: ([AtomicUsize; 1], Vec<AtomicUsize>, u8) = ([ATOMIC], Vec::new(), 7);
12+
//~^ ERROR interior mutable
13+
14+
macro_rules! declare_const {
15+
($name:ident: $ty:ty = $e:expr) => {
16+
const $name: $ty = $e;
17+
};
18+
}
19+
declare_const!(_ONCE: Once = Once::new()); //~ ERROR interior mutable
20+
21+
// const ATOMIC_REF: &AtomicUsize = &AtomicUsize::new(7); // This will simply trigger E0492.
22+
23+
const INTEGER: u8 = 8;
24+
const STRING: String = String::new();
25+
const STR: &str = "012345";
26+
const COW: Cow<str> = Cow::Borrowed("abcdef");
27+
//^ note: a const item of Cow is used in the `postgres` package.
28+
29+
const NO_ANN: &dyn Display = &70;
30+
31+
static STATIC_TUPLE: (AtomicUsize, String) = (ATOMIC, STRING);
32+
//^ there should be no lints on this line
33+
34+
#[allow(clippy::declare_interior_mutable_const)]
35+
const ONCE_INIT: Once = Once::new();
36+
37+
trait Trait<T>: Copy {
38+
type NonCopyType;
39+
40+
const ATOMIC: AtomicUsize; //~ ERROR interior mutable
41+
const INTEGER: u64;
42+
const STRING: String;
43+
const SELF: Self; // (no error)
44+
const INPUT: T;
45+
//~^ ERROR interior mutable
46+
//~| HELP consider requiring `T` to be `Copy`
47+
const ASSOC: Self::NonCopyType;
48+
//~^ ERROR interior mutable
49+
//~| HELP consider requiring `<Self as Trait<T>>::NonCopyType` to be `Copy`
50+
51+
const AN_INPUT: T = Self::INPUT;
52+
//~^ ERROR interior mutable
53+
//~| ERROR consider requiring `T` to be `Copy`
54+
declare_const!(ANOTHER_INPUT: T = Self::INPUT); //~ ERROR interior mutable
55+
}
56+
57+
trait Trait2 {
58+
type CopyType: Copy;
59+
60+
const SELF_2: Self;
61+
//~^ ERROR interior mutable
62+
//~| HELP consider requiring `Self` to be `Copy`
63+
const ASSOC_2: Self::CopyType; // (no error)
64+
}
65+
66+
// we don't lint impl of traits, because an impl has no power to change the interface.
67+
impl Trait<u32> for u64 {
68+
type NonCopyType = u16;
69+
70+
const ATOMIC: AtomicUsize = AtomicUsize::new(9);
71+
const INTEGER: u64 = 10;
72+
const STRING: String = String::new();
73+
const SELF: Self = 11;
74+
const INPUT: u32 = 12;
75+
const ASSOC: Self::NonCopyType = 13;
76+
}
77+
78+
struct Local<T, U>(T, U);
79+
80+
impl<T: Trait2 + Trait<u32>, U: Trait2> Local<T, U> {
81+
const ASSOC_3: AtomicUsize = AtomicUsize::new(14); //~ ERROR interior mutable
82+
const COW: Cow<'static, str> = Cow::Borrowed("tuvwxy");
83+
const T_SELF: T = T::SELF_2;
84+
const U_SELF: U = U::SELF_2;
85+
//~^ ERROR interior mutable
86+
//~| HELP consider requiring `U` to be `Copy`
87+
const T_ASSOC: T::NonCopyType = T::ASSOC;
88+
//~^ ERROR interior mutable
89+
//~| HELP consider requiring `<T as Trait<u32>>::NonCopyType` to be `Copy`
90+
const U_ASSOC: U::CopyType = U::ASSOC_2;
91+
}
92+
93+
fn main() {}

0 commit comments

Comments
 (0)