build: bump version of rust

bpowers · Jun 19, 2024 · 1651ed2 · 1651ed2
1 parent 5edf632
commit 1651ed2
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.78.0"
+channel = "1.79.0"
 components = [ "cargo", "rustfmt", "rustc", "clippy" ]
 targets = [ "wasm32-unknown-unknown" ]
 profile = "minimal"
diff --git a/src/simlin-compat/src/xmile.rs b/src/simlin-compat/src/xmile.rs
@@ -901,11 +901,7 @@ impl From<Unit> for datamodel::Unit {
             name: unit.name,
             equation: unit.eqn.filter(|eqn| !eqn.is_empty()),
             disabled: matches!(unit.disabled, Some(true)),
-            aliases: if let Some(aliases) = unit.alias {
-                aliases
-            } else {
-                vec![]
-            },
+            aliases: unit.alias.unwrap_or_default(),
         }
     }
 }

diff --git a/src/simlin-engine/src/compiler.rs b/src/simlin-engine/src/compiler.rs
@@ -1482,7 +1482,7 @@ impl<'module> Compiler<'module> {
                     BuiltinFn::Lookup(_, _, _) | BuiltinFn::IsModuleInput(_, _) => unreachable!(),
                     BuiltinFn::Inf | BuiltinFn::Pi => {
                         let lit = match builtin {
-                            BuiltinFn::Inf => std::f64::INFINITY,
+                            BuiltinFn::Inf => f64::INFINITY,
                             BuiltinFn::Pi => std::f64::consts::PI,
                             _ => unreachable!(),
                         };
@@ -1820,7 +1820,7 @@ impl<'a> ModuleEvaluator<'a> {
                     BuiltinFn::Arcsin(a) => self.eval(a).asin(),
                     BuiltinFn::Arctan(a) => self.eval(a).atan(),
                     BuiltinFn::Exp(a) => self.eval(a).exp(),
-                    BuiltinFn::Inf => std::f64::INFINITY,
+                    BuiltinFn::Inf => f64::INFINITY,
                     BuiltinFn::Pi => std::f64::consts::PI,
                     BuiltinFn::Int(a) => self.eval(a).floor(),
                     BuiltinFn::IsModuleInput(ident, _) => {

diff --git a/src/simlin-engine/src/vm.rs b/src/simlin-engine/src/vm.rs
@@ -585,7 +585,7 @@ fn apply(func: BuiltinId, time: f64, dt: f64, a: f64, b: f64, c: f64) -> f64 {
         BuiltinId::Arctan => a.atan(),
         BuiltinId::Cos => a.cos(),
         BuiltinId::Exp => a.exp(),
-        BuiltinId::Inf => std::f64::INFINITY,
+        BuiltinId::Inf => f64::INFINITY,
         BuiltinId::Int => a.floor(),
         BuiltinId::Ln => a.ln(),
         BuiltinId::Log10 => a.log10(),