From d28aed6dc45ffccc790469cb04f3f775ddb2283a Mon Sep 17 00:00:00 2001 From: ljedrz Date: Fri, 12 Oct 2018 16:16:00 +0200 Subject: Prefer unwrap_or_else to unwrap_or in case of function calls/allocations --- src/libstd/build.rs | 4 ++-- src/libstd/sys/redox/args.rs | 2 +- src/libstd/sys/unix/process/process_unix.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/build.rs b/src/libstd/build.rs index 0831e29bddd..b3851d22841 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -97,8 +97,8 @@ fn build_libbacktrace(target: &str) -> Result<(), ()> { .file("../libbacktrace/sort.c") .file("../libbacktrace/state.c"); - let any_debug = env::var("RUSTC_DEBUGINFO").unwrap_or(String::new()) == "true" || - env::var("RUSTC_DEBUGINFO_LINES").unwrap_or(String::new()) == "true"; + let any_debug = env::var("RUSTC_DEBUGINFO").unwrap_or_default() == "true" || + env::var("RUSTC_DEBUGINFO_LINES").unwrap_or_default() == "true"; build.debug(any_debug); if target.contains("darwin") { 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 = 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], -- cgit 1.4.1-3-g733a5