diff options
| author | ljedrz <ljedrz@gmail.com> | 2018-10-12 16:16:00 +0200 |
|---|---|---|
| committer | ljedrz <ljedrz@gmail.com> | 2018-10-19 09:45:45 +0200 |
| commit | d28aed6dc45ffccc790469cb04f3f775ddb2283a (patch) | |
| tree | c1a3c356ba1ffc8173746e03f0f630ae4032624f /src/librustc_metadata | |
| parent | cb5e1b93e300cf9772a24c6de27d9f21cdae3123 (diff) | |
| download | rust-d28aed6dc45ffccc790469cb04f3f775ddb2283a.tar.gz rust-d28aed6dc45ffccc790469cb04f3f775ddb2283a.zip | |
Prefer unwrap_or_else to unwrap_or in case of function calls/allocations
Diffstat (limited to 'src/librustc_metadata')
| -rw-r--r-- | src/librustc_metadata/locator.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_metadata/locator.rs b/src/librustc_metadata/locator.rs index adff34af61e..bc1952ea34f 100644 --- a/src/librustc_metadata/locator.rs +++ b/src/librustc_metadata/locator.rs @@ -678,7 +678,7 @@ impl<'a> Context<'a> { if let Some((ref prev, _)) = ret { let sysroot = self.sess.sysroot(); let sysroot = sysroot.canonicalize() - .unwrap_or(sysroot.to_path_buf()); + .unwrap_or_else(|_| sysroot.to_path_buf()); if prev.starts_with(&sysroot) { continue } |