Skip to content

Suggest Option::map_or(_else) for if let Some { y } else { x } #5301

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

Merged
merged 14 commits into from
Jul 6, 2020
Merged

Suggest Option::map_or(_else) for if let Some { y } else { x } #5301

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bf48a2d
Lint for if let Some(x) = ... instead of Option::map_or
JarredAllen Mar 5, 2020
82f8d4d
Stop linting on macros and correctly use braces for constructs
JarredAllen Apr 25, 2020
b85796f
Properly parenthesize to avoid operator precedence errors
JarredAllen Apr 25, 2020
88c8afd
Handle ref, mut, &, and &mut on the option
JarredAllen May 10, 2020
f73b455
Refactoring
JarredAllen May 10, 2020
7c4de9d
Refactoring pt. 2
JarredAllen May 12, 2020
5e20475
Don't lint if contains a macro
JarredAllen May 31, 2020
5150277
Used clippy to clean itself
JarredAllen May 31, 2020
93f0f5d
Last few tweaks
JarredAllen Jun 12, 2020
ccb9998
Fix compile error from library change
JarredAllen Jun 25, 2020
6ce9812
Clean existing lint code to match new lint
JarredAllen Jun 25, 2020
6e2d55c
Update compile-test to follow new lint
JarredAllen Jun 27, 2020
1c32263
Formatted updates to lints
JarredAllen Jul 1, 2020
c8f700e
Fixed compile errors
JarredAllen Jul 4, 2020
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
Prev Previous commit
Next Next commit
Update compile-test to follow new lint
  • Loading branch information
@JarredAllen
JarredAllen committed Jul 3, 2020
commit 6e2d55c8db04a80f9c217f2089066b29302f62a9
12 changes: 2 additions & 10 deletions tests/compile-test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,11 @@ use std::path::{Path, PathBuf};
mod cargo;

fn host_lib() -> PathBuf {
if let Some(path) = option_env!("HOST_LIBS") {
PathBuf::from(path)
} else {
cargo::CARGO_TARGET_DIR.join(env!("PROFILE"))
}
option_env!("HOST_LIBS").map_or(cargo::CARGO_TARGET_DIR.join(env!("PROFILE")), PathBuf::from)
}

fn clippy_driver_path() -> PathBuf {
if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") {
PathBuf::from(path)
} else {
cargo::TARGET_LIB.join("clippy-driver")
}
option_env!("CLIPPY_DRIVER_PATH").map_or(cargo::TARGET_LIB.join("clippy-driver"), PathBuf::from)
}

// When we'll want to use `extern crate ..` for a dependency that is used
Expand Down