about summary refs log tree commit diff
path: root/library/std
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2024-12-11 01:37:17 +0000
committerEsteban Küber <esteban@kuber.com.ar>2024-12-23 03:01:29 +0000
commit1f82b45b6a42eca19a9dc48402abdc02574f791d (patch)
treece418466d0d65b18070a26934ea86a16cbe71829 /library/std
parente108481f74ff123ad98a63bd107a18d13035b275 (diff)
downloadrust-1f82b45b6a42eca19a9dc48402abdc02574f791d.tar.gz
rust-1f82b45b6a42eca19a9dc48402abdc02574f791d.zip
Use `#[derive(Default)]` instead of manually implementing it
Diffstat (limited to 'library/std')
-rw-r--r--library/std/src/panicking.rs9
-rw-r--r--library/std/src/sys_common/process.rs8
2 files changed, 3 insertions, 14 deletions
diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs
index dca5ccca0c4..e7ce5bc6140 100644
--- a/library/std/src/panicking.rs
+++ b/library/std/src/panicking.rs
@@ -81,7 +81,9 @@ extern "C" fn __rust_foreign_exception() -> ! {
     rtabort!("Rust cannot catch foreign exceptions");
 }
 
+#[derive(Default)]
 enum Hook {
+    #[default]
     Default,
     Custom(Box<dyn Fn(&PanicHookInfo<'_>) + 'static + Sync + Send>),
 }
@@ -96,13 +98,6 @@ impl Hook {
     }
 }
 
-impl Default for Hook {
-    #[inline]
-    fn default() -> Hook {
-        Hook::Default
-    }
-}
-
 static HOOK: RwLock<Hook> = RwLock::new(Hook::Default);
 
 /// Registers a custom panic hook, replacing the previously registered hook.
diff --git a/library/std/src/sys_common/process.rs b/library/std/src/sys_common/process.rs
index 5333ee146f7..9f61d69d858 100644
--- a/library/std/src/sys_common/process.rs
+++ b/library/std/src/sys_common/process.rs
@@ -8,19 +8,13 @@ use crate::sys::process::{EnvKey, ExitStatus, Process, StdioPipes};
 use crate::{env, fmt, io};
 
 // Stores a set of changes to an environment
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct CommandEnv {
     clear: bool,
     saw_path: bool,
     vars: BTreeMap<EnvKey, Option<OsString>>,
 }
 
-impl Default for CommandEnv {
-    fn default() -> Self {
-        CommandEnv { clear: false, saw_path: false, vars: Default::default() }
-    }
-}
-
 impl fmt::Debug for CommandEnv {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut debug_command_env = f.debug_struct("CommandEnv");