Skip to content

Commit

Permalink
Fix fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
oxalica committed Jul 19, 2019
1 parent e6bbed9 commit 2cc373a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
2 changes: 1 addition & 1 deletion rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ max_width = 120
comment_width = 100
match_block_trailing_comma = true
wrap_comments = true

edition = "2018"
error_on_line_overflow = true
24 changes: 19 additions & 5 deletions tests/ui/issue_4266.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,33 @@
async fn sink1<'a>(_: &'a str) {} // lint
async fn sink1_elided(_: &str) {} // ok

async fn one_to_one<'a>(s: &'a str) -> &'a str { s } // lint
async fn one_to_one_elided(s: &str) -> &str { s } // ok
async fn all_to_one<'a>(a: &'a str, _b: &'a str) -> &'a str { a } // ok
// lint
async fn one_to_one<'a>(s: &'a str) -> &'a str {
s
}

// ok
async fn one_to_one_elided(s: &str) -> &str {
s
}

// ok
async fn all_to_one<'a>(a: &'a str, _b: &'a str) -> &'a str {
a
}

// async fn unrelated(_: &str, _: &str) {} // Not allowed in async fn

// #3988
struct Foo;
impl Foo {
pub async fn foo(&mut self) {} // ok
// ok
pub async fn foo(&mut self) {}
}

// rust-lang/rust#61115
async fn print(s: &str) { // ok
// ok
async fn print(s: &str) {
println!("{}", s);
}

Expand Down
8 changes: 5 additions & 3 deletions tests/ui/issue_4266.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ LL | async fn sink1<'a>(_: &'a str) {} // lint
= note: `-D clippy::needless-lifetimes` implied by `-D warnings`

error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
--> $DIR/issue_4266.rs:8:1
--> $DIR/issue_4266.rs:9:1
|
LL | async fn one_to_one<'a>(s: &'a str) -> &'a str { s } // lint
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
LL | / async fn one_to_one<'a>(s: &'a str) -> &'a str {
LL | | s
LL | | }
| |_^

error: aborting due to 2 previous errors

0 comments on commit 2cc373a

Please sign in to comment.