Skip to content

Commit 5b759ef

Browse files
shnewtoshnewto
committed
Rename instances of array_indexing
This commit renames instances of `array_indexing` to `indexing_slicing` and moves the `indexing_slicing` lint to the `clippy_pedantic` group. The justification for this commit's changes are detailed in the previous commit's message.
1 parent 7af0c67 commit 5b759ef

File tree

4 files changed

+44
-45
lines changed

4 files changed

+44
-45
lines changed

‎clippy_lints/src/array_indexing.rs renamed to ‎clippy_lints/src/indexing_slicing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::consts::{constant, Constant};
44
use crate::utils::higher::Range;
55
use crate::utils::{self, higher};
6-
use rustc::hir;
6+
use rustc::hir::*;
77
use rustc::lint::*;
88
use rustc::ty;
99
use syntax::ast::RangeLimits;

‎clippy_lints/src/lib.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#![feature(stmt_expr_attributes)]
77
#![feature(range_contains)]
88
#![feature(macro_vis_matcher)]
9-
#![allow(unknown_lints, indexing_slicing, shadow_reuse, missing_docs_in_private_items)]
9+
#![allow(unknown_lints, shadow_reuse, missing_docs_in_private_items)]
1010
#![recursion_limit = "256"]
1111
#![allow(stable_features)]
1212
#![feature(iterator_find_map)]
@@ -99,7 +99,6 @@ pub mod utils;
9999
// begin lints modules, do not remove this comment, it’s used in `update_lints`
100100
pub mod approx_const;
101101
pub mod arithmetic;
102-
pub mod array_indexing;
103102
pub mod assign_ops;
104103
pub mod attrs;
105104
pub mod bit_mask;
@@ -139,6 +138,7 @@ pub mod identity_conversion;
139138
pub mod identity_op;
140139
pub mod if_let_redundant_pattern_matching;
141140
pub mod if_not_else;
141+
pub mod indexing_slicing;
142142
pub mod infallible_destructuring_match;
143143
pub mod infinite_iter;
144144
pub mod inherent_impl;
@@ -355,8 +355,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
355355
);
356356
reg.register_late_lint_pass(box escape::Pass{too_large_for_stack: conf.too_large_for_stack});
357357
reg.register_early_lint_pass(box misc_early::MiscEarly);
358-
reg.register_late_lint_pass(box array_indexing::IndexingSlicingPass);
359-
reg.register_late_lint_pass(box panic::Pass);
358+
reg.register_late_lint_pass(box panic_unimplemented::Pass);
360359
reg.register_late_lint_pass(box strings::StringLitAsBytes);
361360
reg.register_late_lint_pass(box derive::Derive);
362361
reg.register_late_lint_pass(box types::CharLitAsU8);
@@ -432,12 +431,11 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
432431
reg.register_late_lint_pass(box unwrap::Pass);
433432
reg.register_late_lint_pass(box duration_subsec::DurationSubsec);
434433
reg.register_late_lint_pass(box default_trait_access::DefaultTraitAccess);
435-
434+
reg.register_late_lint_pass(box indexing_slicing::IndexingSlicingPass);
436435

437436
reg.register_lint_group("clippy_restriction", vec![
438437
arithmetic::FLOAT_ARITHMETIC,
439438
arithmetic::INTEGER_ARITHMETIC,
440-
array_indexing::INDEXING_SLICING,
441439
assign_ops::ASSIGN_OPS,
442440
else_if_without_else::ELSE_IF_WITHOUT_ELSE,
443441
inherent_impl::MULTIPLE_INHERENT_IMPL,
@@ -468,6 +466,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
468466
enum_variants::PUB_ENUM_VARIANT_NAMES,
469467
enum_variants::STUTTER,
470468
if_not_else::IF_NOT_ELSE,
469+
indexing_slicing::INDEXING_SLICING,
471470
infinite_iter::MAYBE_INFINITE_ITER,
472471
items_after_statements::ITEMS_AFTER_STATEMENTS,
473472
matches::SINGLE_MATCH_ELSE,
@@ -500,7 +499,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
500499

501500
reg.register_lint_group("clippy", vec![
502501
approx_const::APPROX_CONSTANT,
503-
array_indexing::OUT_OF_BOUNDS_INDEXING,
502+
indexing_slicing::OUT_OF_BOUNDS_INDEXING,
504503
assign_ops::ASSIGN_OP_PATTERN,
505504
assign_ops::MISREFACTORED_ASSIGN_OP,
506505
attrs::DEPRECATED_SEMVER,
@@ -863,7 +862,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
863862

864863
reg.register_lint_group("clippy_correctness", vec![
865864
approx_const::APPROX_CONSTANT,
866-
array_indexing::OUT_OF_BOUNDS_INDEXING,
865+
indexing_slicing::OUT_OF_BOUNDS_INDEXING,
867866
attrs::DEPRECATED_SEMVER,
868867
attrs::USELESS_ATTRIBUTE,
869868
bit_mask::BAD_BIT_MASK,

‎tests/ui/array_indexing.rs renamed to ‎tests/ui/indexing_slicing.rs

File renamed without changes.

‎tests/ui/array_indexing.stderr renamed to ‎tests/ui/indexing_slicing.stderr

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,219 +1,219 @@
11
error: indexing may panic. Consider using `.get(n)` or `.get_mut(n)` instead
2-
--> $DIR/array_indexing.rs:11:5
2+
--> $DIR/indexing_slicing.rs:11:5
33
|
44
11 | x[index];
55
| ^^^^^^^^
66
|
77
= note: `-D indexing-slicing` implied by `-D warnings`
88

99
error: slicing may panic. Consider using `.get(n..m)` or `.get_mut(n..m)` instead
10-
--> $DIR/array_indexing.rs:12:6
10+
--> $DIR/indexing_slicing.rs:12:6
1111
|
1212
12 | &x[index_from..index_to];
1313
| ^^^^^^^^^^^^^^^^^^^^^^^
1414

1515
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
16-
--> $DIR/array_indexing.rs:13:6
16+
--> $DIR/indexing_slicing.rs:13:6
1717
|
1818
13 | &x[index_from..][..index_to];
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
2020

2121
error: slicing may panic. Consider using `.get(n..)` or .get_mut(n..)` instead
22-
--> $DIR/array_indexing.rs:13:6
22+
--> $DIR/indexing_slicing.rs:13:6
2323
|
2424
13 | &x[index_from..][..index_to];
2525
| ^^^^^^^^^^^^^^^
2626

2727
error: slicing may panic. Consider using `.get(n..)` or .get_mut(n..)` instead
28-
--> $DIR/array_indexing.rs:14:6
28+
--> $DIR/indexing_slicing.rs:14:6
2929
|
3030
14 | &x[index..];
3131
| ^^^^^^^^^^
3232

3333
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
34-
--> $DIR/array_indexing.rs:15:6
34+
--> $DIR/indexing_slicing.rs:15:6
3535
|
3636
15 | &x[..index];
3737
| ^^^^^^^^^^
3838

3939
error: const index is out of bounds
40-
--> $DIR/array_indexing.rs:18:5
40+
--> $DIR/indexing_slicing.rs:18:5
4141
|
4242
18 | x[4];
4343
| ^^^^
4444
|
4545
= note: `-D out-of-bounds-indexing` implied by `-D warnings`
4646

4747
error: range is out of bounds
48-
--> $DIR/array_indexing.rs:20:6
48+
--> $DIR/indexing_slicing.rs:20:6
4949
|
5050
20 | &x[1..5];
5151
| ^^^^^^^
5252

5353
error: slicing may panic. Consider using `.get(n..m)` or `.get_mut(n..m)` instead
54-
--> $DIR/array_indexing.rs:20:6
54+
--> $DIR/indexing_slicing.rs:20:6
5555
|
5656
20 | &x[1..5];
5757
| ^^^^^^^
5858

5959
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
60-
--> $DIR/array_indexing.rs:21:6
60+
--> $DIR/indexing_slicing.rs:21:6
6161
|
6262
21 | &x[1..][..5];
6363
| ^^^^^^^^^^^
6464

6565
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
66-
--> $DIR/array_indexing.rs:23:6
66+
--> $DIR/indexing_slicing.rs:23:6
6767
|
6868
23 | &x[0..][..3];
6969
| ^^^^^^^^^^^
7070

7171
error: range is out of bounds
72-
--> $DIR/array_indexing.rs:25:6
72+
--> $DIR/indexing_slicing.rs:25:6
7373
|
7474
25 | &x[..=4];
7575
| ^^^^^^^
7676

7777
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
78-
--> $DIR/array_indexing.rs:25:6
78+
--> $DIR/indexing_slicing.rs:25:6
7979
|
8080
25 | &x[..=4];
8181
| ^^^^^^^
8282

8383
error: range is out of bounds
84-
--> $DIR/array_indexing.rs:29:6
84+
--> $DIR/indexing_slicing.rs:29:6
8585
|
8686
29 | &x[5..];
8787
| ^^^^^^
8888

8989
error: slicing may panic. Consider using `.get(n..)` or .get_mut(n..)` instead
90-
--> $DIR/array_indexing.rs:29:6
90+
--> $DIR/indexing_slicing.rs:29:6
9191
|
9292
29 | &x[5..];
9393
| ^^^^^^
9494

9595
error: range is out of bounds
96-
--> $DIR/array_indexing.rs:31:6
96+
--> $DIR/indexing_slicing.rs:31:6
9797
|
9898
31 | &x[..5];
9999
| ^^^^^^
100100

101101
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
102-
--> $DIR/array_indexing.rs:31:6
102+
--> $DIR/indexing_slicing.rs:31:6
103103
|
104104
31 | &x[..5];
105105
| ^^^^^^
106106

107107
error: indexing may panic. Consider using `.get(n)` or `.get_mut(n)` instead
108-
--> $DIR/array_indexing.rs:34:5
108+
--> $DIR/indexing_slicing.rs:34:5
109109
|
110110
34 | y[0];
111111
| ^^^^
112112

113113
error: slicing may panic. Consider using `.get(n..m)` or `.get_mut(n..m)` instead
114-
--> $DIR/array_indexing.rs:35:6
114+
--> $DIR/indexing_slicing.rs:35:6
115115
|
116116
35 | &y[1..2];
117117
| ^^^^^^^
118118

119119
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
120-
--> $DIR/array_indexing.rs:38:6
120+
--> $DIR/indexing_slicing.rs:38:6
121121
|
122122
38 | &y[..=4];
123123
| ^^^^^^^
124124

125125
error: const index is out of bounds
126-
--> $DIR/array_indexing.rs:41:5
126+
--> $DIR/indexing_slicing.rs:41:5
127127
|
128128
41 | empty[0];
129129
| ^^^^^^^^
130130

131131
error: range is out of bounds
132-
--> $DIR/array_indexing.rs:42:6
132+
--> $DIR/indexing_slicing.rs:42:6
133133
|
134134
42 | &empty[1..5];
135135
| ^^^^^^^^^^^
136136

137137
error: slicing may panic. Consider using `.get(n..m)` or `.get_mut(n..m)` instead
138-
--> $DIR/array_indexing.rs:42:6
138+
--> $DIR/indexing_slicing.rs:42:6
139139
|
140140
42 | &empty[1..5];
141141
| ^^^^^^^^^^^
142142

143143
error: range is out of bounds
144-
--> $DIR/array_indexing.rs:44:6
144+
--> $DIR/indexing_slicing.rs:44:6
145145
|
146146
44 | &empty[..=4];
147147
| ^^^^^^^^^^^
148148

149149
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
150-
--> $DIR/array_indexing.rs:44:6
150+
--> $DIR/indexing_slicing.rs:44:6
151151
|
152152
44 | &empty[..=4];
153153
| ^^^^^^^^^^^
154154

155155
error: range is out of bounds
156-
--> $DIR/array_indexing.rs:49:6
156+
--> $DIR/indexing_slicing.rs:49:6
157157
|
158158
49 | &empty[..=0];
159159
| ^^^^^^^^^^^
160160

161161
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
162-
--> $DIR/array_indexing.rs:49:6
162+
--> $DIR/indexing_slicing.rs:49:6
163163
|
164164
49 | &empty[..=0];
165165
| ^^^^^^^^^^^
166166

167167
error: range is out of bounds
168-
--> $DIR/array_indexing.rs:51:6
168+
--> $DIR/indexing_slicing.rs:51:6
169169
|
170170
51 | &empty[1..];
171171
| ^^^^^^^^^^
172172

173173
error: slicing may panic. Consider using `.get(n..)` or .get_mut(n..)` instead
174-
--> $DIR/array_indexing.rs:51:6
174+
--> $DIR/indexing_slicing.rs:51:6
175175
|
176176
51 | &empty[1..];
177177
| ^^^^^^^^^^
178178

179179
error: range is out of bounds
180-
--> $DIR/array_indexing.rs:52:6
180+
--> $DIR/indexing_slicing.rs:52:6
181181
|
182182
52 | &empty[..4];
183183
| ^^^^^^^^^^
184184

185185
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
186-
--> $DIR/array_indexing.rs:52:6
186+
--> $DIR/indexing_slicing.rs:52:6
187187
|
188188
52 | &empty[..4];
189189
| ^^^^^^^^^^
190190

191191
error: indexing may panic. Consider using `.get(n)` or `.get_mut(n)` instead
192-
--> $DIR/array_indexing.rs:55:5
192+
--> $DIR/indexing_slicing.rs:55:5
193193
|
194194
55 | v[0];
195195
| ^^^^
196196

197197
error: indexing may panic. Consider using `.get(n)` or `.get_mut(n)` instead
198-
--> $DIR/array_indexing.rs:56:5
198+
--> $DIR/indexing_slicing.rs:56:5
199199
|
200200
56 | v[10];
201201
| ^^^^^
202202

203203
error: slicing may panic. Consider using `.get(n..m)` or `.get_mut(n..m)` instead
204-
--> $DIR/array_indexing.rs:57:6
204+
--> $DIR/indexing_slicing.rs:57:6
205205
|
206206
57 | &v[10..100];
207207
| ^^^^^^^^^^
208208

209209
error: slicing may panic. Consider using `.get(n..)` or .get_mut(n..)` instead
210-
--> $DIR/array_indexing.rs:58:6
210+
--> $DIR/indexing_slicing.rs:58:6
211211
|
212212
58 | &v[10..];
213213
| ^^^^^^^
214214

215215
error: slicing may panic. Consider using `.get(..n)`or `.get_mut(..n)` instead
216-
--> $DIR/array_indexing.rs:59:6
216+
--> $DIR/indexing_slicing.rs:59:6
217217
|
218218
59 | &v[..100];
219219
| ^^^^^^^^

0 commit comments

Comments
 (0)