Merge pull request #509 from hidekuno/fix-clippy-1.80.1

fix clippy 1.80.1
hidekuno · Aug 26, 2024 · ed22654 · ed22654
2 parents bb442d3 + d52b931
commit ed22654
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 43 deletions.
diff --git a/elisp/src/io.rs b/elisp/src/io.rs
@@ -262,6 +262,7 @@ mod error_tests {
         assert_eq!(do_lisp("(load-file hoge)"), "E1008");
         assert_eq!(do_lisp("(load-file #t)"), "E1015");
         assert_eq!(do_lisp("(load-file \"/etc/test.scm\")"), "E1014");
+        assert_eq!(do_lisp("(load-file \"/etc/shadow\")"), "E1014");
         assert_eq!(do_lisp("(load-file \"/tmp\")"), "E1016");
         assert_eq!(do_lisp("(load-file \"/bin/cp\")"), "E9999");
     }

diff --git a/elisp/src/number.rs b/elisp/src/number.rs
@@ -244,10 +244,10 @@ impl Div for Number {
     fn div(self, other: Number) -> Number {
         if let (Number::Integer(x), Number::Integer(y)) = (self, other) {
             if x == 0 && y == 0 {
-                return Number::Float(std::f64::NAN);
+                return Number::Float(f64::NAN);
             }
             if y == 0 {
-                return Number::Float(std::f64::INFINITY);
+                return Number::Float(f64::INFINITY);
             }
             if 0 != (x % y) {
                 return self

diff --git a/glisp/Cargo.lock b/glisp/Cargo.lock
diff --git a/glisp/Cargo.toml b/glisp/Cargo.toml
@@ -13,6 +13,7 @@ cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core.git", package = "cairo
 surf = "2.1.0"
 serde = { version = "1.0", features = ["derive"] }
 async-std = { version = "1.5.0", features = ["attributes"] }
+wasm-bindgen="0.2.88"
 
 [features]
 animation = []

diff --git a/weblisp/examples/webasync.rs b/weblisp/examples/webasync.rs
@@ -143,11 +143,7 @@ async fn main() {
 
     builder
         .format(|buf, record| {
-            let m = if let Some(m) = record.module_path() {
-                m
-            } else {
-                ""
-            };
+            let m = record.module_path().unwrap_or_default();
             writeln!(
                 buf,
                 "{} {:<6} {:<20} - {}",

diff --git a/weblisp/src/bin/weblisp.rs b/weblisp/src/bin/weblisp.rs
@@ -37,11 +37,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let mut builder = Builder::from_default_env();
     builder
         .format(|buf, record| {
-            let m = if let Some(m) = record.module_path() {
-                m
-            } else {
-                ""
-            };
+            let m = record.module_path().unwrap_or_default();
             writeln!(
                 buf,
                 "{} {:<6} {:<20} - {}",

diff --git a/weblisp/src/web.rs b/weblisp/src/web.rs
@@ -355,7 +355,7 @@ pub fn parse_request(buffer: &[u8]) -> Result<Request, Box<WebError>> {
     } else {
         return Err(Box::new(WebError::UriParse(line!())));
     };
-    let mut parameter = if let Some(s) = iter.next() { s } else { "" };
+    let mut parameter = iter.next().unwrap_or_default();
     let mut headers = Vec::new();
     let mut body = String::from("");
     let mut header = true;