prevent reload crash

1 files changed, 5 insertions, 4 deletions

diff --git a/src/run/builtin.rs b/src/run/builtin.rs
index 5bf7133..c71f10f 100644
--- a/src/run/builtin.rs
+++ b/src/run/builtin.rs
@@ -75,10 +75,9 @@ impl Builtin for re {
         _stdin: &mut dyn Read,
         _stdout: &mut dyn Write,
     ) -> Result {
-        let session = session.lock().unwrap();
-        session.raw.disable();
+        session.lock().unwrap().raw.disable();
         crate::reload::begin_reload();
-        session.raw.enable(); // something went wrong, let's restore raw mode
+        session.lock().unwrap().raw.enable(); // something went wrong, let's restore raw mode
         Ok(())
     }
 }
@@ -189,7 +188,9 @@ impl Builtin for builtins {
         _stdin: &mut dyn Read,
         stdout: &mut dyn Write,
     ) -> Result {
-        for b in super::BUILTINS {
+        let mut bs = super::BUILTINS.to_vec();
+        bs.sort_by_key(|b| b.name());
+        for b in bs.into_iter() {
             write!(stdout, "{} ", b.name())?;
         }
         writeln!(stdout)?;