Skip to content

Commit 8c5938d

Browse files
Rustin170506Rustin170506
committed
Use last segment
1 parent 92d4164 commit 8c5938d

File tree

4 files changed

+23
-28
lines changed

4 files changed

+23
-28
lines changed

Diff for: ‎compiler/rustc_passes/src/stability.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -828,10 +828,7 @@ impl Visitor<'tcx> for Checker<'tcx> {
828828

829829
fn visit_path(&mut self, path: &'tcx hir::Path<'tcx>, id: hir::HirId) {
830830
if let Some(def_id) = path.res.opt_def_id() {
831-
let method_span = match path.segments {
832-
[.., _, last] => Some(last.ident.span),
833-
_ => None,
834-
};
831+
let method_span = path.segments.last().map(|s| s.ident.span);
835832
self.tcx.check_stability(def_id, Some(id), path.span, method_span)
836833
}
837834
intravisit::walk_path(self, path)

Diff for: ‎src/test/ui/deprecation/deprecation-lint-3.stderr

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
error: use of deprecated function `deprecation_lint::deprecated_text`: text
2-
--> $DIR/deprecation-lint-3.rs:13:5
2+
--> $DIR/deprecation-lint-3.rs:13:28
33
|
44
LL | macro_test_arg_nested!(deprecated_text);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^
66
|
77
note: the lint level is defined here
88
--> $DIR/deprecation-lint-3.rs:4:9
99
|
1010
LL | #![deny(deprecated)]
1111
| ^^^^^^^^^^
12-
= note: this error originates in the macro `macro_test_arg_nested` (in Nightly builds, run with -Z macro-backtrace for more info)
1312

1413
error: aborting due to previous error
1514

Diff for: ‎src/test/ui/lint/lint-stability3.stderr

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
error: use of deprecated function `lint_stability::deprecated_text`: text
2-
--> $DIR/lint-stability3.rs:13:5
2+
--> $DIR/lint-stability3.rs:13:28
33
|
44
LL | macro_test_arg_nested!(deprecated_text);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^
66
|
77
note: the lint level is defined here
88
--> $DIR/lint-stability3.rs:4:9
99
|
1010
LL | #![deny(deprecated)]
1111
| ^^^^^^^^^^
12-
= note: this error originates in the macro `macro_test_arg_nested` (in Nightly builds, run with -Z macro-backtrace for more info)
1312

1413
error: aborting due to previous error
1514

Diff for: ‎src/test/ui/stability-attribute/generics-default-stability.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ warning: use of deprecated struct `unstable_generic_param::Struct4`: test
3434
--> $DIR/generics-default-stability.rs:83:12
3535
|
3636
LL | let _: Struct4<isize> = Struct4 { field: 1 };
37-
| ^^^^^^^^^^^^^^
37+
| ^^^^^^^
3838

3939
warning: use of deprecated struct `unstable_generic_param::Struct4`: test
4040
--> $DIR/generics-default-stability.rs:88:12
@@ -46,7 +46,7 @@ warning: use of deprecated struct `unstable_generic_param::Struct4`: test
4646
--> $DIR/generics-default-stability.rs:89:12
4747
|
4848
LL | let _: Struct4<usize> = STRUCT4;
49-
| ^^^^^^^^^^^^^^
49+
| ^^^^^^^
5050

5151
warning: use of deprecated struct `unstable_generic_param::Struct4`: test
5252
--> $DIR/generics-default-stability.rs:90:29
@@ -58,7 +58,7 @@ warning: use of deprecated struct `unstable_generic_param::Struct4`: test
5858
--> $DIR/generics-default-stability.rs:90:12
5959
|
6060
LL | let _: Struct4<isize> = Struct4 { field: 0 };
61-
| ^^^^^^^^^^^^^^
61+
| ^^^^^^^
6262

6363
warning: use of deprecated struct `unstable_generic_param::Struct5`: test
6464
--> $DIR/generics-default-stability.rs:96:29
@@ -70,7 +70,7 @@ warning: use of deprecated struct `unstable_generic_param::Struct5`: test
7070
--> $DIR/generics-default-stability.rs:96:12
7171
|
7272
LL | let _: Struct5<isize> = Struct5 { field: 1 };
73-
| ^^^^^^^^^^^^^^
73+
| ^^^^^^^
7474

7575
warning: use of deprecated struct `unstable_generic_param::Struct5`: test
7676
--> $DIR/generics-default-stability.rs:101:12
@@ -82,7 +82,7 @@ warning: use of deprecated struct `unstable_generic_param::Struct5`: test
8282
--> $DIR/generics-default-stability.rs:102:12
8383
|
8484
LL | let _: Struct5<usize> = STRUCT5;
85-
| ^^^^^^^^^^^^^^
85+
| ^^^^^^^
8686

8787
warning: use of deprecated struct `unstable_generic_param::Struct5`: test
8888
--> $DIR/generics-default-stability.rs:104:29
@@ -94,7 +94,7 @@ warning: use of deprecated struct `unstable_generic_param::Struct5`: test
9494
--> $DIR/generics-default-stability.rs:104:12
9595
|
9696
LL | let _: Struct5<isize> = Struct5 { field: 0 };
97-
| ^^^^^^^^^^^^^^
97+
| ^^^^^^^
9898

9999
warning: use of deprecated type alias `unstable_generic_param::Alias4`: test
100100
--> $DIR/generics-default-stability.rs:159:28
@@ -106,7 +106,7 @@ warning: use of deprecated type alias `unstable_generic_param::Alias4`: test
106106
--> $DIR/generics-default-stability.rs:159:12
107107
|
108108
LL | let _: Alias4<isize> = Alias4::Some(1);
109-
| ^^^^^^^^^^^^^
109+
| ^^^^^^
110110

111111
warning: use of deprecated type alias `unstable_generic_param::Alias4`: test
112112
--> $DIR/generics-default-stability.rs:163:12
@@ -118,7 +118,7 @@ warning: use of deprecated type alias `unstable_generic_param::Alias4`: test
118118
--> $DIR/generics-default-stability.rs:164:12
119119
|
120120
LL | let _: Alias4<usize> = ALIAS4;
121-
| ^^^^^^^^^^^^^
121+
| ^^^^^^
122122

123123
warning: use of deprecated type alias `unstable_generic_param::Alias4`: test
124124
--> $DIR/generics-default-stability.rs:165:28
@@ -130,7 +130,7 @@ warning: use of deprecated type alias `unstable_generic_param::Alias4`: test
130130
--> $DIR/generics-default-stability.rs:165:12
131131
|
132132
LL | let _: Alias4<isize> = Alias4::Some(0);
133-
| ^^^^^^^^^^^^^
133+
| ^^^^^^
134134

135135
warning: use of deprecated type alias `unstable_generic_param::Alias5`: test
136136
--> $DIR/generics-default-stability.rs:170:28
@@ -142,7 +142,7 @@ warning: use of deprecated type alias `unstable_generic_param::Alias5`: test
142142
--> $DIR/generics-default-stability.rs:170:12
143143
|
144144
LL | let _: Alias5<isize> = Alias5::Some(1);
145-
| ^^^^^^^^^^^^^
145+
| ^^^^^^
146146

147147
warning: use of deprecated type alias `unstable_generic_param::Alias5`: test
148148
--> $DIR/generics-default-stability.rs:174:12
@@ -154,7 +154,7 @@ warning: use of deprecated type alias `unstable_generic_param::Alias5`: test
154154
--> $DIR/generics-default-stability.rs:175:12
155155
|
156156
LL | let _: Alias5<usize> = ALIAS5;
157-
| ^^^^^^^^^^^^^
157+
| ^^^^^^
158158

159159
warning: use of deprecated type alias `unstable_generic_param::Alias5`: test
160160
--> $DIR/generics-default-stability.rs:177:28
@@ -166,7 +166,7 @@ warning: use of deprecated type alias `unstable_generic_param::Alias5`: test
166166
--> $DIR/generics-default-stability.rs:177:12
167167
|
168168
LL | let _: Alias5<isize> = Alias5::Some(0);
169-
| ^^^^^^^^^^^^^
169+
| ^^^^^^
170170

171171
warning: use of deprecated variant `unstable_generic_param::Enum4::Some`: test
172172
--> $DIR/generics-default-stability.rs:231:34
@@ -178,7 +178,7 @@ warning: use of deprecated enum `unstable_generic_param::Enum4`: test
178178
--> $DIR/generics-default-stability.rs:231:12
179179
|
180180
LL | let _: Enum4<isize> = Enum4::Some(1);
181-
| ^^^^^^^^^^^^
181+
| ^^^^^
182182

183183
warning: use of deprecated enum `unstable_generic_param::Enum4`: test
184184
--> $DIR/generics-default-stability.rs:235:12
@@ -190,7 +190,7 @@ warning: use of deprecated enum `unstable_generic_param::Enum4`: test
190190
--> $DIR/generics-default-stability.rs:236:12
191191
|
192192
LL | let _: Enum4<usize> = ENUM4;
193-
| ^^^^^^^^^^^^
193+
| ^^^^^
194194

195195
warning: use of deprecated variant `unstable_generic_param::Enum4::Some`: test
196196
--> $DIR/generics-default-stability.rs:237:34
@@ -202,7 +202,7 @@ warning: use of deprecated enum `unstable_generic_param::Enum4`: test
202202
--> $DIR/generics-default-stability.rs:237:12
203203
|
204204
LL | let _: Enum4<isize> = Enum4::Some(0);
205-
| ^^^^^^^^^^^^
205+
| ^^^^^
206206

207207
warning: use of deprecated variant `unstable_generic_param::Enum5::Some`: test
208208
--> $DIR/generics-default-stability.rs:242:34
@@ -214,7 +214,7 @@ warning: use of deprecated enum `unstable_generic_param::Enum5`: test
214214
--> $DIR/generics-default-stability.rs:242:12
215215
|
216216
LL | let _: Enum5<isize> = Enum5::Some(1);
217-
| ^^^^^^^^^^^^
217+
| ^^^^^
218218

219219
warning: use of deprecated enum `unstable_generic_param::Enum5`: test
220220
--> $DIR/generics-default-stability.rs:246:12
@@ -226,7 +226,7 @@ warning: use of deprecated enum `unstable_generic_param::Enum5`: test
226226
--> $DIR/generics-default-stability.rs:247:12
227227
|
228228
LL | let _: Enum5<usize> = ENUM5;
229-
| ^^^^^^^^^^^^
229+
| ^^^^^
230230

231231
warning: use of deprecated variant `unstable_generic_param::Enum5::Some`: test
232232
--> $DIR/generics-default-stability.rs:249:34
@@ -238,7 +238,7 @@ warning: use of deprecated enum `unstable_generic_param::Enum5`: test
238238
--> $DIR/generics-default-stability.rs:249:12
239239
|
240240
LL | let _: Enum5<isize> = Enum5::Some(0);
241-
| ^^^^^^^^^^^^
241+
| ^^^^^
242242

243243
error[E0658]: use of unstable library feature 'unstable_default'
244244
--> $DIR/generics-default-stability.rs:35:20

0 commit comments

Comments
 (0)