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/libstd/sys | |
| 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/libstd/sys')
| -rw-r--r-- | src/libstd/sys/redox/args.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/process/process_unix.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/redox/args.rs b/src/libstd/sys/redox/args.rs index 556ed77372e..a7c8ade66f0 100644 --- a/src/libstd/sys/redox/args.rs +++ b/src/libstd/sys/redox/args.rs @@ -85,7 +85,7 @@ mod imp { } pub fn args() -> Args { - let bytes = clone().unwrap_or(Vec::new()); + let bytes = clone().unwrap_or_default(); let v: Vec<OsString> = bytes.into_iter().map(|v| { OsStringExt::from_vec(v) }).collect(); diff --git a/src/libstd/sys/unix/process/process_unix.rs b/src/libstd/sys/unix/process/process_unix.rs index 9d6d607e3f3..7f1f9353c6d 100644 --- a/src/libstd/sys/unix/process/process_unix.rs +++ b/src/libstd/sys/unix/process/process_unix.rs @@ -331,7 +331,7 @@ impl Command { cvt(libc::posix_spawnattr_setflags(&mut attrs.0, flags as _))?; let envp = envp.map(|c| c.as_ptr()) - .unwrap_or(*sys::os::environ() as *const _); + .unwrap_or_else(|| *sys::os::environ() as *const _); let ret = libc::posix_spawnp( &mut p.pid, self.get_argv()[0], |
