From 2a1bb3f81508d65cce019c5557add6dbc8d2c558 Mon Sep 17 00:00:00 2001 From: Magnus Ulimoen Date: Tue, 5 Jul 2022 20:19:49 +0200 Subject: [PATCH] Use serde1 feature --- euler/Cargo.toml | 2 +- gridgeneration/Cargo.toml | 2 +- heat-equation/Cargo.toml | 2 +- maxwell/Cargo.toml | 2 +- multigrid/Cargo.toml | 4 ++-- multigrid/src/main.rs | 3 ++- sbp/Cargo.toml | 2 +- sbp/src/utils.rs | 4 ++-- shallow_water/Cargo.toml | 2 +- utils/constmatrix/Cargo.toml | 2 +- utils/fast-float/Cargo.toml | 4 +--- utils/float/Cargo.toml | 2 +- utils/integrate/Cargo.toml | 2 +- webfront/Cargo.toml | 2 +- 14 files changed, 17 insertions(+), 18 deletions(-) diff --git a/euler/Cargo.toml b/euler/Cargo.toml index efd49aa..5f389da 100644 --- a/euler/Cargo.toml +++ b/euler/Cargo.toml @@ -2,7 +2,7 @@ name = "euler" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [features] # Internal feature flag to gate the expensive tests diff --git a/gridgeneration/Cargo.toml b/gridgeneration/Cargo.toml index f5a095c..b53eb5b 100644 --- a/gridgeneration/Cargo.toml +++ b/gridgeneration/Cargo.toml @@ -2,7 +2,7 @@ name = "gridgeneration" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [dependencies] ndarray = { version = "0.15.0", default-features = false } diff --git a/heat-equation/Cargo.toml b/heat-equation/Cargo.toml index d41df54..70c3fa0 100644 --- a/heat-equation/Cargo.toml +++ b/heat-equation/Cargo.toml @@ -2,7 +2,7 @@ name = "heat-equation" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [dependencies] diff --git a/maxwell/Cargo.toml b/maxwell/Cargo.toml index 6bc0190..52fbc30 100644 --- a/maxwell/Cargo.toml +++ b/maxwell/Cargo.toml @@ -2,7 +2,7 @@ name = "maxwell" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [features] sparse = ["sbp/sparse", "dep:sprs"] diff --git a/multigrid/Cargo.toml b/multigrid/Cargo.toml index 8ff0362..6b8db33 100644 --- a/multigrid/Cargo.toml +++ b/multigrid/Cargo.toml @@ -2,7 +2,7 @@ name = "multigrid" version = "0.1.0" authors = ["Magnus Ulimoen "] -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" diff --git a/multigrid/src/main.rs b/multigrid/src/main.rs index 9b83ecd..43d7a7e 100644 --- a/multigrid/src/main.rs +++ b/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(), ) } diff --git a/sbp/Cargo.toml b/sbp/Cargo.toml index 24f704e..ae968d9 100644 --- a/sbp/Cargo.toml +++ b/sbp/Cargo.toml @@ -2,7 +2,7 @@ name = "sbp" version = "0.1.1" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [dependencies] ndarray = { version = "0.15.0", features = ["approx"] } diff --git a/sbp/src/utils.rs b/sbp/src/utils.rs index 09fc34a..02bc15e 100644 --- a/sbp/src/utils.rs +++ b/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 { diff --git a/shallow_water/Cargo.toml b/shallow_water/Cargo.toml index f0bab6e..5685e54 100644 --- a/shallow_water/Cargo.toml +++ b/shallow_water/Cargo.toml @@ -2,7 +2,7 @@ name = "shallow-water" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [dependencies] ndarray = "0.15.0" diff --git a/utils/constmatrix/Cargo.toml b/utils/constmatrix/Cargo.toml index 7ece053..0cb62d9 100644 --- a/utils/constmatrix/Cargo.toml +++ b/utils/constmatrix/Cargo.toml @@ -2,7 +2,7 @@ name = "constmatrix" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [dependencies] approx = { version = "0.4.0", optional = true } diff --git a/utils/fast-float/Cargo.toml b/utils/fast-float/Cargo.toml index 45c8e69..390f9f1 100644 --- a/utils/fast-float/Cargo.toml +++ b/utils/fast-float/Cargo.toml @@ -2,9 +2,7 @@ name = "fast-float" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +edition = "2021" [dependencies] float = { path = "../float" } diff --git a/utils/float/Cargo.toml b/utils/float/Cargo.toml index c39f627..8857abe 100644 --- a/utils/float/Cargo.toml +++ b/utils/float/Cargo.toml @@ -2,7 +2,7 @@ name = "float" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [features] f32 = [] diff --git a/utils/integrate/Cargo.toml b/utils/integrate/Cargo.toml index ca63675..1c6ec1f 100644 --- a/utils/integrate/Cargo.toml +++ b/utils/integrate/Cargo.toml @@ -2,7 +2,7 @@ name = "integrate" version = "0.1.0" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [dependencies] float = { path = "../float/" } diff --git a/webfront/Cargo.toml b/webfront/Cargo.toml index e336fe2..b5af385 100644 --- a/webfront/Cargo.toml +++ b/webfront/Cargo.toml @@ -2,7 +2,7 @@ name = "sbp-web" version = "0.1.1" authors = ["Magnus Ulimoen "] -edition = "2018" +edition = "2021" [lib] crate-type = ["cdylib"]