nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 11:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for expect being used to unwrap Option

Browse Source
This commit is contained in:
Krishna Sai Veera Reddy 2020-02-09 08:54:23 -08:00
parent be1bc571c3
commit 0e5ba2f0e7
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clippy_lints/src/option_env_unwrap.rs
View File

@ -38,7 +38,8 @@ impl EarlyLintPass for OptionEnvUnwrap {
if_chain! { if_chain! {
if !in_external_macro(cx.sess, expr.span); if !in_external_macro(cx.sess, expr.span);
if let ExprKind::MethodCall(path_segment, args) = &expr.kind; if let ExprKind::MethodCall(path_segment, args) = &expr.kind;
if path_segment.ident.as_str() == "unwrap"; let method_name = path_segment.ident.as_str();
if method_name == "expect" || method_name == "unwrap";
if let ExprKind::Call(caller, _) = &args[0].kind; if let ExprKind::Call(caller, _) = &args[0].kind;
if is_direct_expn_of(caller.span, "option_env").is_some(); if is_direct_expn_of(caller.span, "option_env").is_some();
then { then {
@ -46,7 +47,7 @@ impl EarlyLintPass for OptionEnvUnwrap {
cx, cx,
OPTION_ENV_UNWRAP, OPTION_ENV_UNWRAP,
expr.span, expr.span,
"this will panic at run-time if the environment variable doesn't exist", "this will panic at run-time if the environment variable doesn't exist at compile-time",
"consider using the `env!` macro instead" "consider using the `env!` macro instead"
); );
} }

5
tests/ui/option_env_unwrap.rs
View File

@ -4,9 +4,14 @@ macro_rules! option_env_unwrap {
($env: expr) => { ($env: expr) => {
option_env!($env).unwrap() option_env!($env).unwrap()
}; };
($env: expr, $message: expr) => {
option_env!($env).expect($message)
};
} }
fn main() { fn main() {
let _ = option_env!("HOME").unwrap(); let _ = option_env!("HOME").unwrap();
let _ = option_env!("HOME").expect("environment variable HOME isn't set");
let _ = option_env_unwrap!("HOME"); let _ = option_env_unwrap!("HOME");
let _ = option_env_unwrap!("HOME", "environment variable HOME isn't set");
} }

28
tests/ui/option_env_unwrap.stderr
View File

@ -1,5 +1,5 @@
error: this will panic at run-time if the environment variable doesn't exist error: this will panic at run-time if the environment variable doesn't exist at compile-time
--> $DIR/option_env_unwrap.rs:10:13 --> $DIR/option_env_unwrap.rs:13:13
| |
LL | let _ = option_env!("HOME").unwrap(); LL | let _ = option_env!("HOME").unwrap();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -7,7 +7,15 @@ LL | let _ = option_env!("HOME").unwrap();
= note: `-D clippy::option-env-unwrap` implied by `-D warnings` = note: `-D clippy::option-env-unwrap` implied by `-D warnings`
= help: consider using the `env!` macro instead = help: consider using the `env!` macro instead
error: this will panic at run-time if the environment variable doesn't exist error: this will panic at run-time if the environment variable doesn't exist at compile-time
--> $DIR/option_env_unwrap.rs:14:13
|
LL | let _ = option_env!("HOME").expect("environment variable HOME isn't set");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: consider using the `env!` macro instead
error: this will panic at run-time if the environment variable doesn't exist at compile-time
--> $DIR/option_env_unwrap.rs:5:9 --> $DIR/option_env_unwrap.rs:5:9
| |
LL | option_env!($env).unwrap() LL | option_env!($env).unwrap()
@ -19,5 +27,17 @@ LL | let _ = option_env_unwrap!("HOME");
= help: consider using the `env!` macro instead = help: consider using the `env!` macro instead
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to 2 previous errors error: this will panic at run-time if the environment variable doesn't exist at compile-time
--> $DIR/option_env_unwrap.rs:8:9
|
LL | option_env!($env).expect($message)
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
LL | let _ = option_env_unwrap!("HOME", "environment variable HOME isn't set");
| ----------------------------------------------------------------- in this macro invocation
|
= help: consider using the `env!` macro instead
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to 4 previous errors