user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add label to lint for lifetimes used once

Browse source
This commit is contained in:
Esteban Küber 2018-06-21 18:17:42 -07:00
parent ec60dd81f9
commit 973baaa5b2
9 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc/middle/resolve_lifetime.rs
View file

@ -1395,7 +1395,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
lifetimeuseset
);
match lifetimeuseset {
Some(LifetimeUseSet::One(_)) => {
Some(LifetimeUseSet::One(lifetime)) => {
let node_id = self.tcx.hir.as_local_node_id(def_id).unwrap();
debug!("node id first={:?}", node_id);
if let Some((id, span, name)) = match self.tcx.hir.get(node_id) {
@ -1408,12 +1408,15 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
_ => None,
} {
debug!("id = {:?} span = {:?} name = {:?}", node_id, span, name);
self.tcx.struct_span_lint_node(
let mut err = self.tcx.struct_span_lint_node(
lint::builtin::SINGLE_USE_LIFETIMES,
id,
span,
&format!("lifetime parameter `{}` only used once", name),
).emit();
);
err.span_label(span, "this lifetime...");
err.span_label(lifetime.span, "...is used only here");
err.emit();
}
}
Some(LifetimeUseSet::Many) => {

4
src/test/ui/single-use-lifetime/fn-types.stderr
View file

@ -2,7 +2,9 @@ error: lifetime parameter `'a` only used once
--> $DIR/fn-types.rs:19:10
|
LL | a: for<'a> fn(&'a u32), //~ ERROR `'a` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
|
note: lint level defined here
--> $DIR/fn-types.rs:11:9

6
src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr
View file

@ -3,6 +3,9 @@ error: lifetime parameter `'b` only used once
|
LL | fn a(x: &'a u32, y: &'b u32) {
| ^^
| |
| this lifetime...
| ...is used only here
|
note: lint level defined here
--> $DIR/one-use-in-fn-argument-in-band.rs:12:9
@ -15,6 +18,9 @@ error: lifetime parameter `'a` only used once
|
LL | fn a(x: &'a u32, y: &'b u32) {
| ^^
| |
| this lifetime...
| ...is used only here
error: aborting due to 2 previous errors

4
src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr
View file

@ -2,7 +2,9 @@ error: lifetime parameter `'a` only used once
--> $DIR/one-use-in-fn-argument.rs:18:6
|
LL | fn a<'a>(x: &'a u32) { //~ ERROR `'a` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
|
note: lint level defined here
--> $DIR/one-use-in-fn-argument.rs:11:9

4
src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr
View file

@ -2,7 +2,9 @@ error: lifetime parameter `'f` only used once
--> $DIR/one-use-in-inherent-impl-header.rs:24:6
|
LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
|
note: lint level defined here
--> $DIR/one-use-in-inherent-impl-header.rs:11:9

8
src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr
View file

@ -2,7 +2,9 @@ error: lifetime parameter `'a` only used once
--> $DIR/one-use-in-inherent-method-argument.rs:22:19
|
LL | fn inherent_a<'a>(&self, data: &'a u32) { //~ ERROR `'a` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
|
note: lint level defined here
--> $DIR/one-use-in-inherent-method-argument.rs:11:9
@ -14,7 +16,9 @@ error: lifetime parameter `'f` only used once
--> $DIR/one-use-in-inherent-method-argument.rs:21:6
|
LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
error: aborting due to 2 previous errors

4
src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr
View file

@ -2,7 +2,9 @@ error: lifetime parameter `'f` only used once
--> $DIR/one-use-in-inherent-method-return.rs:22:6
|
LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
|
note: lint level defined here
--> $DIR/one-use-in-inherent-method-return.rs:11:9

4
src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr
View file

@ -2,7 +2,9 @@ error: lifetime parameter `'g` only used once
--> $DIR/one-use-in-trait-method-argument.rs:25:13
|
LL | fn next<'g>(&'g mut self) -> Option<Self::Item> { //~ ERROR `'g` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
|
note: lint level defined here
--> $DIR/one-use-in-trait-method-argument.rs:14:9

4
src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr
View file

@ -2,7 +2,9 @@ error: lifetime parameter `'f` only used once
--> $DIR/two-uses-in-inherent-method-argument-and-return.rs:22:6
|
LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once
| ^^
| ^^ -- ...is used only here
| |
| this lifetime...
|
note: lint level defined here
--> $DIR/two-uses-in-inherent-method-argument-and-return.rs:14:9