diff options
| author | bors <bors@rust-lang.org> | 2020-03-05 21:39:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-05 21:39:00 +0000 |
| commit | b818ccc74c993d41286731f67ce1e2bc2a3f1918 (patch) | |
| tree | 6743244ae1971d5aeab96ba3f6e27eb395787de4 /src/libstd/sys | |
| parent | 96bb8b31c81dc2394317f2f083c3acf8087efea1 (diff) | |
| parent | 80c843431d54a4afb7ec92ceaa37cf4faa0a0653 (diff) | |
| download | rust-b818ccc74c993d41286731f67ce1e2bc2a3f1918.tar.gz rust-b818ccc74c993d41286731f67ce1e2bc2a3f1918.zip | |
Auto merge of #69746 - Dylan-DPC:rollup-wr6dvdk, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #69697 (Add explanation for E0380) - #69698 (Use associated constants of integer types) - #69711 (Update macros.rs: fix documentation typo.) - #69713 (more clippy cleanups) - #69728 (Make link to `std::str` active) - #69732 (Clean E0382 and E0384 explanations) - #69736 (even more clippy cleanups) - #69742 (Fixed a typo) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/process/process_common.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs index 83f052c898b..859da691ad2 100644 --- a/src/libstd/sys/unix/process/process_common.rs +++ b/src/libstd/sys/unix/process/process_common.rs @@ -19,9 +19,9 @@ cfg_if::cfg_if! { if #[cfg(target_os = "fuchsia")] { // fuchsia doesn't have /dev/null } else if #[cfg(target_os = "redox")] { - const DEV_NULL: &'static str = "null:\0"; + const DEV_NULL: &str = "null:\0"; } else { - const DEV_NULL: &'static str = "/dev/null\0"; + const DEV_NULL: &str = "/dev/null\0"; } } |