Skip to content

Commit 57782e0

Browse files
JarchoJarcho
committed
Rewrite non_copy_const 
1 parent 95d7eda commit 57782e0

File tree

21 files changed

+981
-677
lines changed

21 files changed

+981
-677
lines changed

‎clippy_lints/src/non_copy_const.rs‎

Lines changed: 728 additions & 335 deletions
Large diffs are not rendered by default.

‎clippy_utils/src/ty/mod.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,3 +1361,14 @@ pub fn is_slice_like<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
13611361
|| ty.is_array()
13621362
|| matches!(ty.kind(), ty::Adt(adt_def, _) if cx.tcx.is_diagnostic_item(sym::Vec, adt_def.did()))
13631363
}
1364+
1365+
/// Gets the index of a field by name.
1366+
pub fn get_field_idx_by_name(ty: Ty<'_>, name: Symbol) -> Option<usize> {
1367+
match *ty.kind() {
1368+
ty::Adt(def, _) if def.is_union() || def.is_struct() => {
1369+
def.non_enum_variant().fields.iter().position(|f| f.name == name)
1370+
},
1371+
ty::Tuple(_) => name.as_str().parse::<usize>().ok(),
1372+
_ => None,
1373+
}
1374+
}

‎tests/ui/borrow_interior_mutable_const/enums.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const UNFROZEN_VARIANT: OptionalCell = OptionalCell::Unfrozen(Cell::new(true));
1919
const FROZEN_VARIANT: OptionalCell = OptionalCell::Frozen;
2020

2121
fn borrow_optional_cell() {
22-
let _ = &UNFROZEN_VARIANT; //~ ERROR: interior mutability
22+
let _ = &UNFROZEN_VARIANT; //~ borrow_interior_mutable_const
2323
let _ = &FROZEN_VARIANT;
2424
}
2525

@@ -34,11 +34,11 @@ trait AssocConsts {
3434
// This is the "suboptimal behavior" mentioned in `is_value_unfrozen`
3535
// caused by a similar reason to unfrozen types without any default values
3636
// get linted even if it has frozen variants'.
37-
let _ = &Self::TO_BE_FROZEN_VARIANT; //~ ERROR: interior mutability
37+
let _ = &Self::TO_BE_FROZEN_VARIANT;
3838

3939
// The lint ignores default values because an impl of this trait can set
4040
// an unfrozen variant to `DEFAULTED_ON_FROZEN_VARIANT` and use the default impl for `function`.
41-
let _ = &Self::DEFAULTED_ON_FROZEN_VARIANT; //~ ERROR: interior mutability
41+
let _ = &Self::DEFAULTED_ON_FROZEN_VARIANT;
4242
}
4343
}
4444

@@ -47,9 +47,9 @@ impl AssocConsts for u64 {
4747
const TO_BE_FROZEN_VARIANT: OptionalCell = OptionalCell::Frozen;
4848

4949
fn function() {
50-
let _ = &<Self as AssocConsts>::TO_BE_UNFROZEN_VARIANT; //~ ERROR: interior mutability
50+
let _ = &<Self as AssocConsts>::TO_BE_UNFROZEN_VARIANT; //~ borrow_interior_mutable_const
5151
let _ = &<Self as AssocConsts>::TO_BE_FROZEN_VARIANT;
52-
let _ = &Self::DEFAULTED_ON_UNFROZEN_VARIANT; //~ ERROR: interior mutability
52+
let _ = &Self::DEFAULTED_ON_UNFROZEN_VARIANT; //~ borrow_interior_mutable_const
5353
let _ = &Self::DEFAULTED_ON_FROZEN_VARIANT;
5454
}
5555
}
@@ -71,7 +71,7 @@ impl AssocTypes for u64 {
7171
const TO_BE_FROZEN_VARIANT: Option<Self::ToBeUnfrozen> = None;
7272

7373
fn function() {
74-
let _ = &<Self as AssocTypes>::TO_BE_UNFROZEN_VARIANT; //~ ERROR: interior mutability
74+
let _ = &<Self as AssocTypes>::TO_BE_UNFROZEN_VARIANT; //~ borrow_interior_mutable_const
7575
let _ = &<Self as AssocTypes>::TO_BE_FROZEN_VARIANT;
7676
}
7777
}
@@ -88,14 +88,14 @@ impl<T> BothOfCellAndGeneric<T> {
8888
const FROZEN_VARIANT: BothOfCellAndGeneric<T> = BothOfCellAndGeneric::Frozen(5);
8989

9090
fn function() {
91-
let _ = &Self::UNFROZEN_VARIANT; //~ ERROR: interior mutability
92-
let _ = &Self::GENERIC_VARIANT; //~ ERROR: interior mutability
91+
let _ = &Self::UNFROZEN_VARIANT; //~ borrow_interior_mutable_const
92+
let _ = &Self::GENERIC_VARIANT;
9393
let _ = &Self::FROZEN_VARIANT;
9494
}
9595
}
9696

9797
fn main() {
9898
// constants defined in foreign crates
99-
let _ = &helper::WRAPPED_PRIVATE_UNFROZEN_VARIANT; //~ ERROR: interior mutability
99+
let _ = &helper::WRAPPED_PRIVATE_UNFROZEN_VARIANT; //~ borrow_interior_mutable_const
100100
let _ = &helper::WRAPPED_PRIVATE_FROZEN_VARIANT;
101101
}

‎tests/ui/borrow_interior_mutable_const/enums.stderr‎

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: a `const` item with interior mutability should not be borrowed
2-
--> tests/ui/borrow_interior_mutable_const/enums.rs:22:14
2+
--> tests/ui/borrow_interior_mutable_const/enums.rs:22:13
33
|
44
LL | let _ = &UNFROZEN_VARIANT;
5-
| ^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^^^
66
|
77
= help: assign this const to a local or static variable, and use the variable here
88
note: the lint level is defined here
@@ -12,68 +12,44 @@ LL | #![deny(clippy::borrow_interior_mutable_const)]
1212
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1313

1414
error: a `const` item with interior mutability should not be borrowed
15-
--> tests/ui/borrow_interior_mutable_const/enums.rs:37:18
16-
|
17-
LL | let _ = &Self::TO_BE_FROZEN_VARIANT;
18-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
19-
|
20-
= help: assign this const to a local or static variable, and use the variable here
21-
22-
error: a `const` item with interior mutability should not be borrowed
23-
--> tests/ui/borrow_interior_mutable_const/enums.rs:41:18
24-
|
25-
LL | let _ = &Self::DEFAULTED_ON_FROZEN_VARIANT;
26-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
27-
|
28-
= help: assign this const to a local or static variable, and use the variable here
29-
30-
error: a `const` item with interior mutability should not be borrowed
31-
--> tests/ui/borrow_interior_mutable_const/enums.rs:50:18
15+
--> tests/ui/borrow_interior_mutable_const/enums.rs:50:17
3216
|
3317
LL | let _ = &<Self as AssocConsts>::TO_BE_UNFROZEN_VARIANT;
34-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3519
|
3620
= help: assign this const to a local or static variable, and use the variable here
3721

3822
error: a `const` item with interior mutability should not be borrowed
39-
--> tests/ui/borrow_interior_mutable_const/enums.rs:52:18
23+
--> tests/ui/borrow_interior_mutable_const/enums.rs:52:17
4024
|
4125
LL | let _ = &Self::DEFAULTED_ON_UNFROZEN_VARIANT;
42-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
26+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4327
|
4428
= help: assign this const to a local or static variable, and use the variable here
4529

4630
error: a `const` item with interior mutability should not be borrowed
47-
--> tests/ui/borrow_interior_mutable_const/enums.rs:74:18
31+
--> tests/ui/borrow_interior_mutable_const/enums.rs:74:17
4832
|
4933
LL | let _ = &<Self as AssocTypes>::TO_BE_UNFROZEN_VARIANT;
50-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
34+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5135
|
5236
= help: assign this const to a local or static variable, and use the variable here
5337

5438
error: a `const` item with interior mutability should not be borrowed
55-
--> tests/ui/borrow_interior_mutable_const/enums.rs:91:18
39+
--> tests/ui/borrow_interior_mutable_const/enums.rs:91:17
5640
|
5741
LL | let _ = &Self::UNFROZEN_VARIANT;
58-
| ^^^^^^^^^^^^^^^^^^^^^^
59-
|
60-
= help: assign this const to a local or static variable, and use the variable here
61-
62-
error: a `const` item with interior mutability should not be borrowed
63-
--> tests/ui/borrow_interior_mutable_const/enums.rs:92:18
64-
|
65-
LL | let _ = &Self::GENERIC_VARIANT;
66-
| ^^^^^^^^^^^^^^^^^^^^^
42+
| ^^^^^^^^^^^^^^^^^^^^^^^
6743
|
6844
= help: assign this const to a local or static variable, and use the variable here
6945

7046
error: a `const` item with interior mutability should not be borrowed
71-
--> tests/ui/borrow_interior_mutable_const/enums.rs:99:14
47+
--> tests/ui/borrow_interior_mutable_const/enums.rs:99:13
7248
|
7349
LL | let _ = &helper::WRAPPED_PRIVATE_UNFROZEN_VARIANT;
74-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
50+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7551
|
7652
= help: assign this const to a local or static variable, and use the variable here
7753

78-
error: aborting due to 9 previous errors
54+
error: aborting due to 6 previous errors
7955

‎tests/ui/borrow_interior_mutable_const/others.rs‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,14 @@ mod issue12979 {
6262
const CELL_REF: StaticRef<(UnsafeCell<u32>,)> = unsafe { StaticRef::new(std::ptr::null()) };
6363

6464
fn main() {
65-
ATOMIC.store(1, Ordering::SeqCst);
66-
//~^ borrow_interior_mutable_const
67-
assert_eq!(ATOMIC.load(Ordering::SeqCst), 5);
68-
//~^ borrow_interior_mutable_const
65+
ATOMIC.store(1, Ordering::SeqCst); //~ borrow_interior_mutable_const
66+
assert_eq!(ATOMIC.load(Ordering::SeqCst), 5); //~ borrow_interior_mutable_const
6967

7068
let _once = ONCE_INIT;
71-
let _once_ref = &ONCE_INIT;
72-
//~^ borrow_interior_mutable_const
73-
let _once_ref_2 = &&ONCE_INIT;
74-
//~^ borrow_interior_mutable_const
75-
let _once_ref_4 = &&&&ONCE_INIT;
76-
//~^ borrow_interior_mutable_const
77-
let _once_mut = &mut ONCE_INIT;
78-
//~^ borrow_interior_mutable_const
69+
let _once_ref = &ONCE_INIT; //~ borrow_interior_mutable_const
70+
let _once_ref_2 = &&ONCE_INIT; //~ borrow_interior_mutable_const
71+
let _once_ref_4 = &&&&ONCE_INIT; //~ borrow_interior_mutable_const
72+
let _once_mut = &mut ONCE_INIT; //~ borrow_interior_mutable_const
7973
let _atomic_into_inner = ATOMIC.into_inner();
8074
// these should be all fine.
8175
let _twice = (ONCE_INIT, ONCE_INIT);
@@ -86,30 +80,22 @@ fn main() {
8680
let _ref_array_once = &[ONCE_INIT, ONCE_INIT][0];
8781

8882
// referencing projection is still bad.
89-
let _ = &ATOMIC_TUPLE;
90-
//~^ borrow_interior_mutable_const
91-
let _ = &ATOMIC_TUPLE.0;
92-
//~^ borrow_interior_mutable_const
93-
let _ = &(&&&&ATOMIC_TUPLE).0;
94-
//~^ borrow_interior_mutable_const
95-
let _ = &ATOMIC_TUPLE.0[0];
96-
//~^ borrow_interior_mutable_const
97-
let _ = ATOMIC_TUPLE.0[0].load(Ordering::SeqCst);
98-
//~^ borrow_interior_mutable_const
83+
let _ = &ATOMIC_TUPLE; //~ borrow_interior_mutable_const
84+
let _ = &ATOMIC_TUPLE.0; //~ borrow_interior_mutable_const
85+
let _ = &(&&&&ATOMIC_TUPLE).0; //~ borrow_interior_mutable_const
86+
let _ = &ATOMIC_TUPLE.0[0]; //~ borrow_interior_mutable_const
87+
let _ = ATOMIC_TUPLE.0[0].load(Ordering::SeqCst); //~ borrow_interior_mutable_const
9988
let _ = &ATOMIC_TUPLE.2;
100-
let _ = (&&&&ATOMIC_TUPLE).0;
101-
let _ = (&&&&ATOMIC_TUPLE).2;
89+
let _ = (&&&&ATOMIC_TUPLE).0; //~ borrow_interior_mutable_const
90+
let _ = (&&&&ATOMIC_TUPLE).2; //~ borrow_interior_mutable_const
10291
let _ = ATOMIC_TUPLE.0;
10392
let _ = ATOMIC_TUPLE.0[0];
104-
//~^ borrow_interior_mutable_const
10593
let _ = ATOMIC_TUPLE.1.into_iter();
10694
let _ = ATOMIC_TUPLE.2;
10795
let _ = &{ ATOMIC_TUPLE };
10896

109-
CELL.set(2);
110-
//~^ borrow_interior_mutable_const
111-
assert_eq!(CELL.get(), 6);
112-
//~^ borrow_interior_mutable_const
97+
CELL.set(2); //~ borrow_interior_mutable_const
98+
assert_eq!(CELL.get(), 6); //~ borrow_interior_mutable_const
11399

114100
assert_eq!(INTEGER, 8);
115101
assert!(STRING.is_empty());

‎tests/ui/borrow_interior_mutable_const/others.stderr‎

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ error: a `const` item with interior mutability should not be borrowed
44
LL | ATOMIC.store(1, Ordering::SeqCst);
55
| ^^^^^^
66
|
7+
= note: there is a compiler inserted borrow here
78
= help: assign this const to a local or static variable, and use the variable here
89
note: the lint level is defined here
910
--> tests/ui/borrow_interior_mutable_const/others.rs:1:9
@@ -12,108 +13,120 @@ LL | #![deny(clippy::borrow_interior_mutable_const)]
1213
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1314

1415
error: a `const` item with interior mutability should not be borrowed
15-
--> tests/ui/borrow_interior_mutable_const/others.rs:67:16
16+
--> tests/ui/borrow_interior_mutable_const/others.rs:66:16
1617
|
1718
LL | assert_eq!(ATOMIC.load(Ordering::SeqCst), 5);
1819
| ^^^^^^
1920
|
21+
= note: there is a compiler inserted borrow here
2022
= help: assign this const to a local or static variable, and use the variable here
2123

2224
error: a `const` item with interior mutability should not be borrowed
23-
--> tests/ui/borrow_interior_mutable_const/others.rs:71:22
25+
--> tests/ui/borrow_interior_mutable_const/others.rs:69:21
2426
|
2527
LL | let _once_ref = &ONCE_INIT;
26-
| ^^^^^^^^^
28+
| ^^^^^^^^^^
2729
|
2830
= help: assign this const to a local or static variable, and use the variable here
2931

3032
error: a `const` item with interior mutability should not be borrowed
31-
--> tests/ui/borrow_interior_mutable_const/others.rs:73:25
33+
--> tests/ui/borrow_interior_mutable_const/others.rs:70:24
3234
|
3335
LL | let _once_ref_2 = &&ONCE_INIT;
34-
| ^^^^^^^^^
36+
| ^^^^^^^^^^
3537
|
3638
= help: assign this const to a local or static variable, and use the variable here
3739

3840
error: a `const` item with interior mutability should not be borrowed
39-
--> tests/ui/borrow_interior_mutable_const/others.rs:75:27
41+
--> tests/ui/borrow_interior_mutable_const/others.rs:71:26
4042
|
4143
LL | let _once_ref_4 = &&&&ONCE_INIT;
42-
| ^^^^^^^^^
44+
| ^^^^^^^^^^
4345
|
4446
= help: assign this const to a local or static variable, and use the variable here
4547

4648
error: a `const` item with interior mutability should not be borrowed
47-
--> tests/ui/borrow_interior_mutable_const/others.rs:77:26
49+
--> tests/ui/borrow_interior_mutable_const/others.rs:72:21
4850
|
4951
LL | let _once_mut = &mut ONCE_INIT;
50-
| ^^^^^^^^^
52+
| ^^^^^^^^^^^^^^
5153
|
5254
= help: assign this const to a local or static variable, and use the variable here
5355

5456
error: a `const` item with interior mutability should not be borrowed
55-
--> tests/ui/borrow_interior_mutable_const/others.rs:89:14
57+
--> tests/ui/borrow_interior_mutable_const/others.rs:83:13
5658
|
5759
LL | let _ = &ATOMIC_TUPLE;
58-
| ^^^^^^^^^^^^
60+
| ^^^^^^^^^^^^^
5961
|
6062
= help: assign this const to a local or static variable, and use the variable here
6163

6264
error: a `const` item with interior mutability should not be borrowed
63-
--> tests/ui/borrow_interior_mutable_const/others.rs:91:14
65+
--> tests/ui/borrow_interior_mutable_const/others.rs:84:13
6466
|
6567
LL | let _ = &ATOMIC_TUPLE.0;
66-
| ^^^^^^^^^^^^
68+
| ^^^^^^^^^^^^^^^
6769
|
6870
= help: assign this const to a local or static variable, and use the variable here
6971

7072
error: a `const` item with interior mutability should not be borrowed
71-
--> tests/ui/borrow_interior_mutable_const/others.rs:93:19
73+
--> tests/ui/borrow_interior_mutable_const/others.rs:85:18
7274
|
7375
LL | let _ = &(&&&&ATOMIC_TUPLE).0;
74-
| ^^^^^^^^^^^^
76+
| ^^^^^^^^^^^^^
7577
|
7678
= help: assign this const to a local or static variable, and use the variable here
7779

7880
error: a `const` item with interior mutability should not be borrowed
79-
--> tests/ui/borrow_interior_mutable_const/others.rs:95:14
81+
--> tests/ui/borrow_interior_mutable_const/others.rs:86:13
8082
|
8183
LL | let _ = &ATOMIC_TUPLE.0[0];
82-
| ^^^^^^^^^^^^
84+
| ^^^^^^^^^^^^^^^^^^
8385
|
8486
= help: assign this const to a local or static variable, and use the variable here
8587

8688
error: a `const` item with interior mutability should not be borrowed
87-
--> tests/ui/borrow_interior_mutable_const/others.rs:97:13
89+
--> tests/ui/borrow_interior_mutable_const/others.rs:87:13
8890
|
8991
LL | let _ = ATOMIC_TUPLE.0[0].load(Ordering::SeqCst);
90-
| ^^^^^^^^^^^^
92+
| ^^^^^^^^^^^^^^^^^
9193
|
94+
= note: there is a compiler inserted borrow here
9295
= help: assign this const to a local or static variable, and use the variable here
9396

9497
error: a `const` item with interior mutability should not be borrowed
95-
--> tests/ui/borrow_interior_mutable_const/others.rs:103:13
98+
--> tests/ui/borrow_interior_mutable_const/others.rs:89:17
9699
|
97-
LL | let _ = ATOMIC_TUPLE.0[0];
98-
| ^^^^^^^^^^^^
100+
LL | let _ = (&&&&ATOMIC_TUPLE).0;
101+
| ^^^^^^^^^^^^^
99102
|
100103
= help: assign this const to a local or static variable, and use the variable here
101104

102105
error: a `const` item with interior mutability should not be borrowed
103-
--> tests/ui/borrow_interior_mutable_const/others.rs:109:5
106+
--> tests/ui/borrow_interior_mutable_const/others.rs:90:17
107+
|
108+
LL | let _ = (&&&&ATOMIC_TUPLE).2;
109+
| ^^^^^^^^^^^^^
110+
|
111+
= help: assign this const to a local or static variable, and use the variable here
112+
113+
error: a `const` item with interior mutability should not be borrowed
114+
--> tests/ui/borrow_interior_mutable_const/others.rs:97:5
104115
|
105116
LL | CELL.set(2);
106117
| ^^^^
107118
|
119+
= note: there is a compiler inserted borrow here
108120
= help: assign this const to a local or static variable, and use the variable here
109121

110122
error: a `const` item with interior mutability should not be borrowed
111-
--> tests/ui/borrow_interior_mutable_const/others.rs:111:16
123+
--> tests/ui/borrow_interior_mutable_const/others.rs:98:16
112124
|
113125
LL | assert_eq!(CELL.get(), 6);
114126
| ^^^^
115127
|
128+
= note: there is a compiler inserted borrow here
116129
= help: assign this const to a local or static variable, and use the variable here
117130

118-
error: aborting due to 14 previous errors
131+
error: aborting due to 15 previous errors
119132

0 commit comments

Comments
 (0)