Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI test cleanup: Extract expect_fun_call tests #3397

Merged
merged 1 commit into from
Nov 2, 2018
Merged

UI test cleanup: Extract expect_fun_call tests #3397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions tests/ui/expect_fun_call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![warn(clippy::expect_fun_call)]
#![allow(clippy::useless_format)]

/// Checks implementation of the `EXPECT_FUN_CALL` lint

fn expect_fun_call() {
struct Foo;

impl Foo {
fn new() -> Self { Foo }

fn expect(&self, msg: &str) {
panic!("{}", msg)
}
}

let with_some = Some("value");
with_some.expect("error");

let with_none: Option<i32> = None;
with_none.expect("error");

let error_code = 123_i32;
let with_none_and_format: Option<i32> = None;
with_none_and_format.expect(&format!("Error {}: fake error", error_code));

let with_none_and_as_str: Option<i32> = None;
with_none_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());

let with_ok: Result<(), ()> = Ok(());
with_ok.expect("error");

let with_err: Result<(), ()> = Err(());
with_err.expect("error");

let error_code = 123_i32;
let with_err_and_format: Result<(), ()> = Err(());
with_err_and_format.expect(&format!("Error {}: fake error", error_code));

let with_err_and_as_str: Result<(), ()> = Err(());
with_err_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());

let with_dummy_type = Foo::new();
with_dummy_type.expect("another test string");

let with_dummy_type_and_format = Foo::new();
with_dummy_type_and_format.expect(&format!("Error {}: fake error", error_code));

let with_dummy_type_and_as_str = Foo::new();
with_dummy_type_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());

//Issue #2979 - this should not lint
let msg = "bar";
Some("foo").expect(msg);

Some("foo").expect({ &format!("error") });
Some("foo").expect(format!("error").as_ref());
}

fn main() {}
40 changes: 40 additions & 0 deletions tests/ui/expect_fun_call.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
error: use of `expect` followed by a function call
--> $DIR/expect_fun_call.rs:34:26
|
34 | with_none_and_format.expect(&format!("Error {}: fake error", error_code));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("Error {}: fake error", error_code))`
|
= note: `-D clippy::expect-fun-call` implied by `-D warnings`

error: use of `expect` followed by a function call
--> $DIR/expect_fun_call.rs:37:26
|
37 | with_none_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("Error {}: fake error", error_code))`

error: use of `expect` followed by a function call
--> $DIR/expect_fun_call.rs:47:25
|
47 | with_err_and_format.expect(&format!("Error {}: fake error", error_code));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|_| panic!("Error {}: fake error", error_code))`

error: use of `expect` followed by a function call
--> $DIR/expect_fun_call.rs:50:25
|
50 | with_err_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|_| panic!("Error {}: fake error", error_code))`

error: use of `expect` followed by a function call
--> $DIR/expect_fun_call.rs:65:17
|
65 | Some("foo").expect({ &format!("error") });
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| { let msg = { &format!("error") }; panic!(msg) }))`

error: use of `expect` followed by a function call
--> $DIR/expect_fun_call.rs:66:17
|
66 | Some("foo").expect(format!("error").as_ref());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("error"))`

error: aborting due to 6 previous errors

55 changes: 0 additions & 55 deletions tests/ui/methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,61 +353,6 @@ fn or_fun_call() {
let _ = stringy.unwrap_or("".to_owned());
}

/// Checks implementation of the `EXPECT_FUN_CALL` lint
fn expect_fun_call() {
struct Foo;

impl Foo {
fn new() -> Self { Foo }

fn expect(&self, msg: &str) {
panic!("{}", msg)
}
}

let with_some = Some("value");
with_some.expect("error");

let with_none: Option<i32> = None;
with_none.expect("error");

let error_code = 123_i32;
let with_none_and_format: Option<i32> = None;
with_none_and_format.expect(&format!("Error {}: fake error", error_code));

let with_none_and_as_str: Option<i32> = None;
with_none_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());

let with_ok: Result<(), ()> = Ok(());
with_ok.expect("error");

let with_err: Result<(), ()> = Err(());
with_err.expect("error");

let error_code = 123_i32;
let with_err_and_format: Result<(), ()> = Err(());
with_err_and_format.expect(&format!("Error {}: fake error", error_code));

let with_err_and_as_str: Result<(), ()> = Err(());
with_err_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());

let with_dummy_type = Foo::new();
with_dummy_type.expect("another test string");

let with_dummy_type_and_format = Foo::new();
with_dummy_type_and_format.expect(&format!("Error {}: fake error", error_code));

let with_dummy_type_and_as_str = Foo::new();
with_dummy_type_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());

//Issue #2979 - this should not lint
let msg = "bar";
Some("foo").expect(msg);

Some("foo").expect({ &format!("error") });
Some("foo").expect(format!("error").as_ref());
}

/// Checks implementation of `ITER_NTH` lint
fn iter_nth() {
let mut some_vec = vec![0, 1, 2, 3];
Expand Down
106 changes: 25 additions & 81 deletions tests/ui/methods.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,139 +323,83 @@ error: use of `unwrap_or` followed by a function call
353 | let _ = stringy.unwrap_or("".to_owned());
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| "".to_owned())`

error: `error_code` is shadowed by `123_i32`
--> $DIR/methods.rs:387:9
|
387 | let error_code = 123_i32;
| ^^^^^^^^^^
|
= note: `-D clippy::shadow-unrelated` implied by `-D warnings`
note: initialization happens here
--> $DIR/methods.rs:387:22
|
387 | let error_code = 123_i32;
| ^^^^^^^
note: previous binding is here
--> $DIR/methods.rs:374:9
|
374 | let error_code = 123_i32;
| ^^^^^^^^^^

error: use of `expect` followed by a function call
--> $DIR/methods.rs:376:26
|
376 | with_none_and_format.expect(&format!("Error {}: fake error", error_code));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("Error {}: fake error", error_code))`
|
= note: `-D clippy::expect-fun-call` implied by `-D warnings`

error: use of `expect` followed by a function call
--> $DIR/methods.rs:379:26
|
379 | with_none_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("Error {}: fake error", error_code))`

error: use of `expect` followed by a function call
--> $DIR/methods.rs:389:25
|
389 | with_err_and_format.expect(&format!("Error {}: fake error", error_code));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|_| panic!("Error {}: fake error", error_code))`

error: use of `expect` followed by a function call
--> $DIR/methods.rs:392:25
|
392 | with_err_and_as_str.expect(format!("Error {}: fake error", error_code).as_str());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|_| panic!("Error {}: fake error", error_code))`

error: use of `expect` followed by a function call
--> $DIR/methods.rs:407:17
|
407 | Some("foo").expect({ &format!("error") });
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| { let msg = { &format!("error") }; panic!(msg) }))`

error: use of `expect` followed by a function call
--> $DIR/methods.rs:408:17
|
408 | Some("foo").expect(format!("error").as_ref());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("error"))`

error: called `.iter().nth()` on a Vec. Calling `.get()` is both faster and more readable
--> $DIR/methods.rs:419:23
--> $DIR/methods.rs:364:23
|
419 | let bad_vec = some_vec.iter().nth(3);
364 | let bad_vec = some_vec.iter().nth(3);
| ^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::iter-nth` implied by `-D warnings`

error: called `.iter().nth()` on a slice. Calling `.get()` is both faster and more readable
--> $DIR/methods.rs:420:26
--> $DIR/methods.rs:365:26
|
420 | let bad_slice = &some_vec[..].iter().nth(3);
365 | let bad_slice = &some_vec[..].iter().nth(3);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^

error: called `.iter().nth()` on a slice. Calling `.get()` is both faster and more readable
--> $DIR/methods.rs:421:31
--> $DIR/methods.rs:366:31
|
421 | let bad_boxed_slice = boxed_slice.iter().nth(3);
366 | let bad_boxed_slice = boxed_slice.iter().nth(3);
| ^^^^^^^^^^^^^^^^^^^^^^^^^

error: called `.iter().nth()` on a VecDeque. Calling `.get()` is both faster and more readable
--> $DIR/methods.rs:422:29
--> $DIR/methods.rs:367:29
|
422 | let bad_vec_deque = some_vec_deque.iter().nth(3);
367 | let bad_vec_deque = some_vec_deque.iter().nth(3);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: called `.iter_mut().nth()` on a Vec. Calling `.get_mut()` is both faster and more readable
--> $DIR/methods.rs:427:23
--> $DIR/methods.rs:372:23
|
427 | let bad_vec = some_vec.iter_mut().nth(3);
372 | let bad_vec = some_vec.iter_mut().nth(3);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^

error: called `.iter_mut().nth()` on a slice. Calling `.get_mut()` is both faster and more readable
--> $DIR/methods.rs:430:26
--> $DIR/methods.rs:375:26
|
430 | let bad_slice = &some_vec[..].iter_mut().nth(3);
375 | let bad_slice = &some_vec[..].iter_mut().nth(3);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: called `.iter_mut().nth()` on a VecDeque. Calling `.get_mut()` is both faster and more readable
--> $DIR/methods.rs:433:29
--> $DIR/methods.rs:378:29
|
433 | let bad_vec_deque = some_vec_deque.iter_mut().nth(3);
378 | let bad_vec_deque = some_vec_deque.iter_mut().nth(3);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
--> $DIR/methods.rs:445:13
--> $DIR/methods.rs:390:13
|
445 | let _ = some_vec.iter().skip(42).next();
390 | let _ = some_vec.iter().skip(42).next();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::iter-skip-next` implied by `-D warnings`

error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
--> $DIR/methods.rs:446:13
--> $DIR/methods.rs:391:13
|
446 | let _ = some_vec.iter().cycle().skip(42).next();
391 | let _ = some_vec.iter().cycle().skip(42).next();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
--> $DIR/methods.rs:447:13
--> $DIR/methods.rs:392:13
|
447 | let _ = (1..10).skip(10).next();
392 | let _ = (1..10).skip(10).next();
| ^^^^^^^^^^^^^^^^^^^^^^^

error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
--> $DIR/methods.rs:448:14
--> $DIR/methods.rs:393:14
|
448 | let _ = &some_vec[..].iter().skip(3).next();
393 | let _ = &some_vec[..].iter().skip(3).next();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
--> $DIR/methods.rs:457:13
--> $DIR/methods.rs:402:13
|
457 | let _ = opt.unwrap();
402 | let _ = opt.unwrap();
| ^^^^^^^^^^^^
|
= note: `-D clippy::option-unwrap-used` implied by `-D warnings`

error: aborting due to 57 previous errors
error: aborting due to 50 previous errors