Skip to content

Commit

Permalink
const_static_lifetime: this applies not only to path types
Browse files Browse the repository at this point in the history
For example, &'static [u8] or &'static (t1, t2).
  • Loading branch information
birkenfeld committed Nov 18, 2017
1 parent 2d005b5 commit 296edda
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 13 deletions.
29 changes: 16 additions & 13 deletions clippy_lints/src/const_static_lifetime.rs
Expand Up @@ -48,20 +48,23 @@ impl StaticConst {
TyKind::Rptr(ref optional_lifetime, ref borrow_type) => {
// Match the 'static lifetime
if let Some(lifetime) = *optional_lifetime {
if let TyKind::Path(_, _) = borrow_type.ty.node {
// Verify that the path is a str
if lifetime.ident.name == "'static" {
let mut sug: String = String::new();
span_lint_and_then(
cx,
CONST_STATIC_LIFETIME,
lifetime.span,
"Constants have by default a `'static` lifetime",
|db| {
db.span_suggestion(lifetime.span, "consider removing `'static`", sug);
},
);
match borrow_type.ty.node {
TyKind::Path(..) | TyKind::Slice(..) | TyKind::Array(..) |
TyKind::Tup(..) => {
if lifetime.ident.name == "'static" {
let mut sug: String = String::new();
span_lint_and_then(
cx,
CONST_STATIC_LIFETIME,
lifetime.span,
"Constants have by default a `'static` lifetime",
|db| {
db.span_suggestion(lifetime.span, "consider removing `'static`", sug);
},
);
}
}
_ => {}
}
}
self.visit_type(&*borrow_type.ty, cx);
Expand Down
6 changes: 6 additions & 0 deletions tests/ui/const_static_lifetime.rs
Expand Up @@ -17,6 +17,12 @@ const VAR_SEVEN: &[&(&str, &'static [&'static str])] = &[&("one", &["other one"]

const VAR_HEIGHT: &'static Foo = &Foo {};

const VAR_SLICE: &'static [u8] = b"Test constant #1"; // ERROR Consider removing 'static.

const VAR_TUPLE: &'static (u8, u8) = &(1, 2); // ERROR Consider removing 'static.

const VAR_ARRAY: &'static [u8; 1] = b"T"; // ERROR Consider removing 'static.

fn main() {
let false_positive: &'static str = "test";
println!("{}", VAR_ONE);
Expand Down
30 changes: 30 additions & 0 deletions tests/ui/const_static_lifetime.stderr
Expand Up @@ -24,6 +24,12 @@ error: Constants have by default a `'static` lifetime
10 | const VAR_FOUR: (&str, (&str, &'static str), &'static str) = ("on", ("th", "th"), "on"); // ERROR Consider removing 'static
| ^^^^^^^ help: consider removing `'static`

error: Constants have by default a `'static` lifetime
--> $DIR/const_static_lifetime.rs:12:18
|
12 | const VAR_FIVE: &'static [&[&'static str]] = &[&["test"], &["other one"]]; // ERROR Consider removing 'static
| ^^^^^^^ help: consider removing `'static`

error: Constants have by default a `'static` lifetime
--> $DIR/const_static_lifetime.rs:12:30
|
Expand All @@ -36,6 +42,12 @@ error: Constants have by default a `'static` lifetime
14 | const VAR_SIX: &'static u8 = &5;
| ^^^^^^^ help: consider removing `'static`

error: Constants have by default a `'static` lifetime
--> $DIR/const_static_lifetime.rs:16:29
|
16 | const VAR_SEVEN: &[&(&str, &'static [&'static str])] = &[&("one", &["other one"])];
| ^^^^^^^ help: consider removing `'static`

error: Constants have by default a `'static` lifetime
--> $DIR/const_static_lifetime.rs:16:39
|
Expand All @@ -48,3 +60,21 @@ error: Constants have by default a `'static` lifetime
18 | const VAR_HEIGHT: &'static Foo = &Foo {};
| ^^^^^^^ help: consider removing `'static`

error: Constants have by default a `'static` lifetime
--> $DIR/const_static_lifetime.rs:20:19
|
20 | const VAR_SLICE: &'static [u8] = b"Test constant #1"; // ERROR Consider removing 'static.
| ^^^^^^^ help: consider removing `'static`

error: Constants have by default a `'static` lifetime
--> $DIR/const_static_lifetime.rs:22:19
|
22 | const VAR_TUPLE: &'static (u8, u8) = &(1, 2); // ERROR Consider removing 'static.
| ^^^^^^^ help: consider removing `'static`

error: Constants have by default a `'static` lifetime
--> $DIR/const_static_lifetime.rs:24:19
|
24 | const VAR_ARRAY: &'static [u8; 1] = b"T"; // ERROR Consider removing 'static.
| ^^^^^^^ help: consider removing `'static`

0 comments on commit 296edda

Please sign in to comment.