Use serde1 feature

euler/Cargo.toml

@@ -2,7 +2,7 @@
 name = "euler"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 # Internal feature flag to gate the expensive tests

gridgeneration/Cargo.toml

@@ -2,7 +2,7 @@
 name = "gridgeneration"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ndarray = { version = "0.15.0", default-features = false }

heat-equation/Cargo.toml

@@ -2,7 +2,7 @@
 name = "heat-equation"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 
 [dependencies]

maxwell/Cargo.toml

@@ -2,7 +2,7 @@
 name = "maxwell"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 sparse = ["sbp/sparse", "dep:sprs"]

multigrid/Cargo.toml

@@ -2,7 +2,7 @@
 name = "multigrid"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 
 [dependencies]
@@ -11,7 +11,7 @@ euler = { path = "../euler", features = ["serde1"] }
 hdf5 = "0.8.1"
 integrate = { path = "../utils/integrate" }
 rayon = "1.3.0"
-indicatif = "0.17.0-beta.1"
+indicatif = "0.17.0-rc.11"
 ndarray = { version = "0.15.0", features = ["serde"] }
 serde = { version = "1.0.115", features = ["derive"] }
 json5 = "0.3.0"

multigrid/src/main.rs

@@ -166,6 +166,7 @@ fn progressbar(ntime: u64) -> indicatif::ProgressBar {
     let progressbar = indicatif::ProgressBar::new(ntime);
     progressbar.with_style(
         indicatif::ProgressStyle::default_bar()
-            .template("{wide_bar:.cyan/blue} {pos}/{len} ({eta})"),
+            .template("{wide_bar:.cyan/blue} {pos}/{len} ({eta})")
+            .unwrap(),
     )
 }

sbp/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sbp"
 version = "0.1.1"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ndarray = { version = "0.15.0", features = ["approx"] }

sbp/src/utils.rs

@@ -4,12 +4,12 @@ use crate::Float;
 mod jacobi;
 #[cfg(feature = "sparse")]
 pub use jacobi::*;
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde1")]
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "sparse")]
 pub use sprs::kronecker_product;
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 #[derive(Copy, Clone, Debug, Default)]
 /// struct to hold output for four directions
 pub struct Direction<T> {

shallow_water/Cargo.toml

@@ -2,7 +2,7 @@
 name = "shallow-water"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ndarray = "0.15.0"

utils/constmatrix/Cargo.toml

@@ -2,7 +2,7 @@
 name = "constmatrix"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 approx = { version = "0.4.0", optional = true }

utils/fast-float/Cargo.toml

@@ -2,9 +2,7 @@
 name = "fast-float"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+edition = "2021"
 
 [dependencies]
 float = { path = "../float" }

utils/float/Cargo.toml

@@ -2,7 +2,7 @@
 name = "float"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 f32 = []

utils/integrate/Cargo.toml

@@ -2,7 +2,7 @@
 name = "integrate"
 version = "0.1.0"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 float = { path = "../float/" }

webfront/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sbp-web"
 version = "0.1.1"
 authors = ["Magnus Ulimoen <magnus@ulimoen.dev>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]