Remove warnings

shellgei · Jan 18, 2025 · b05ed5b · b05ed5b
1 parent dc60621
commit b05ed5b
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 24 deletions.
diff --git a/src/core.rs b/src/core.rs
@@ -60,20 +60,20 @@ impl ShellCore {
         }
 
         let home = core.db.get_param("HOME").unwrap_or(String::new()).to_string();
-        core.db.set_param("HISTFILE", &(home + "/.sush_history"));
-        core.db.set_param("HISTFILESIZE", "2000");
+        core.db.set_param("HISTFILE", &(home + "/.sush_history")).unwrap();
+        core.db.set_param("HISTFILESIZE", "2000").unwrap();
 
         core
     }
 
     fn set_initial_parameters(&mut self) {
-        self.db.set_param("$", &process::id().to_string());
-        self.db.set_param("BASHPID", &process::id().to_string());
-        self.db.set_param("BASH_SUBSHELL", "0");
-        self.db.set_param("?", "0");
-        self.db.set_param("PS1", "\\[\\033[01;36m\\]\\b\\[\\033[00m\\]\\[\\033[01;35m\\]\\w\\[\\033[00m\\](debug)🍣 ");
-        self.db.set_param("PS2", "> ");
-        self.db.set_param("HOME", &env::var("HOME").unwrap_or("/".to_string()));
+        self.db.set_param("$", &process::id().to_string()).unwrap();
+        self.db.set_param("BASHPID", &process::id().to_string()).unwrap();
+        self.db.set_param("BASH_SUBSHELL", "0").unwrap();
+        self.db.set_param("?", "0").unwrap();
+        self.db.set_param("PS1", "\\[\\033[01;36m\\]\\b\\[\\033[00m\\]\\[\\033[01;35m\\]\\w\\[\\033[00m\\](debug)🍣 ").unwrap();
+        self.db.set_param("PS2", "> ").unwrap();
+        self.db.set_param("HOME", &env::var("HOME").unwrap_or("/".to_string())).unwrap();
     }
 
     pub fn has_flag(&self, flag: char) -> bool {

diff --git a/src/elements/command.rs b/src/elements/command.rs
@@ -59,7 +59,7 @@ pub trait Command {
         if self.get_redirects().iter_mut().all(|r| r.connect(true, core)){
             self.run(core, false);
         }else{
-            core.db.set_param("?", "1");
+            core.db.set_param("?", "1").unwrap();
         }
         self.get_redirects().iter_mut().rev().for_each(|r| r.restore());
     }

diff --git a/src/elements/command/brace.rs b/src/elements/command/brace.rs
@@ -36,7 +36,7 @@ impl BraceCommand {
             ans.text.push_str(&ans.script.as_ref().unwrap().get_text());
             ans.text.push_str(&feeder.consume(1));
 
-            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text);
+            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text)?;
             Ok(Some(ans))
         }else{
             Ok(None)

diff --git a/src/elements/command/if.rs b/src/elements/command/if.rs
@@ -91,7 +91,7 @@ impl IfCommand {
             return Ok(None);
         }
 
-        command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text);
+        command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text)?;
         Ok(Some(ans))
     }
 }
diff --git a/src/elements/command/paren.rs b/src/elements/command/paren.rs
@@ -44,7 +44,7 @@ impl ParenCommand {
             ans.text.push_str(&ans.script.as_ref().unwrap().get_text());
             ans.text.push_str(&feeder.consume(1));
 
-            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text);
+            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text)?;
             Ok(Some(ans))
         }else{
             Ok(None)

diff --git a/src/elements/command/simple.rs b/src/elements/command/simple.rs
@@ -116,7 +116,7 @@ impl SimpleCommand {
         feeder.set_backup();
 
         loop {
-            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text);
+            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text)?;
             if ! Self::eat_word(feeder, &mut ans, core)? {
                 break;
             }

diff --git a/src/elements/command/while.rs b/src/elements/command/while.rs
@@ -49,7 +49,7 @@ impl WhileCommand {
             ans.text.push_str(&ans.do_script.as_mut().unwrap().get_text());
             ans.text.push_str(&feeder.consume(4)); //done
 
-            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text);
+            command::eat_redirects(feeder, core, &mut ans.redirects, &mut ans.text)?;
             Ok(Some(ans))
         }else{
             Ok(None)

diff --git a/src/elements/pipeline.rs b/src/elements/pipeline.rs
@@ -19,7 +19,7 @@ pub struct Pipeline {
 impl Pipeline {
     pub fn exec(&mut self, core: &mut ShellCore, pgid: Pid) -> Vec<Option<Pid>> {
         if core.sigint.load(Relaxed) { //以下4行追加
-            core.db.set_param("?", "130");
+            core.db.set_param("?", "130").unwrap();
             return vec![];
         }
 

diff --git a/src/elements/script.rs b/src/elements/script.rs
@@ -3,6 +3,7 @@
 
 use super::job::Job;
 use crate::{Feeder, ShellCore};
+use crate::error::parse;
 use crate::error::parse::ParseError;
 
 enum Status{
@@ -79,8 +80,11 @@ impl Script {
                 Status::NormalEnd => return Ok(Some(ans)),
                 Status::UnexpectedSymbol(s) => {
                     eprintln!("Unexpected token: {}", s);
-                    core.db.set_param("?", "2");
-                    break;
+                    let e = ParseError::UnexpectedSymbol(s.clone());
+                    parse::print_error(e.clone(), core);
+                    core.db.set_param("?", "2").unwrap();
+                    feeder.consume(feeder.len());
+                    return Err(e);
                 },
                 Status::NeedMoreLine => {
                     if ! feeder.feed_additional_line(core).is_ok() {

diff --git a/src/feeder.rs b/src/feeder.rs
@@ -101,15 +101,15 @@ impl Feeder {
             Ok(()) => Ok(()),
             Err(InputError::Eof) => {
                 eprintln!("sush: syntax error: unexpected end of file");
-                core.db.set_param("?", "2");
+                core.db.set_param("?", "2").unwrap();
                 exit::normal(core);
                 //return Err(ParseError::Input(InputError::Eof));
             },
             Err(InputError::Interrupt) => {
-                core.db.set_param("?", "130");
+                core.db.set_param("?", "130").unwrap();
                 Err(ParseError::Input(InputError::Interrupt))
             },
-            Err(e) => {
+            Err(_) => {
                 Err(ParseError::Input(InputError::History))
             },
         }

diff --git a/src/feeder/terminal.rs b/src/feeder/terminal.rs
@@ -391,7 +391,7 @@ pub fn read_line(core: &mut ShellCore, prompt: &str) -> Result<String, InputErro
             event::Key::Right |
             event::Key::Up => match on_arrow_key(&mut term, core, c.as_ref().unwrap(), 0) {
                 Ok(()) => {},
-                Err(e) => return Err(InputError::History),
+                Err(_) => return Err(InputError::History),
             },
             event::Key::Backspace => term.backspace(),
             event::Key::Delete => term.delete(),

diff --git a/src/signal.rs b/src/signal.rs
@@ -53,7 +53,7 @@ pub fn input_interrupt_check(feeder: &mut Feeder, core: &mut ShellCore) -> bool
     }
 
     core.sigint.store(false, Relaxed); //core.input_interrupt = false;
-    core.db.set_param("?", "130");
+    core.db.set_param("?", "130").unwrap();
     feeder.consume(feeder.len());
     true
 }
diff --git a/src/utils/exit.rs b/src/utils/exit.rs
@@ -5,7 +5,7 @@ use crate::ShellCore;
 use std::process;
 
 pub fn normal(core: &mut ShellCore) -> ! {
-    core.write_history_to_file();
+    let _ = core.write_history_to_file();
 
     let es_str = core.db.get_param("?").unwrap();
     let exit_status = match es_str.parse::<i32>() {