diff --git a/Cargo.toml b/Cargo.toml index b9bd711..a41877e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,28 +11,28 @@ crate-type = ["lib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bincode = "1.3.1" +bincode = "1.3" common_macros = "0.1" -crossterm = "0.18" +crossterm = "0.20" csv = "1.1" decorum = "0.3" dyn-clone = "1.0" enum_dispatch = "0.3" -env_logger = "0.7" -float_eq = "0.5" -font8x8 = "0.2" +env_logger = "0.9" +float_eq = "0.6" +font8x8 = "0.3" futures = "0.3" image = "0.23" -imageproc = "0.21" -indexmap = "1.6" -itertools = "0.9" +imageproc = "0.22" +indexmap = "1.7" +itertools = "0.10" lazy_static = "1.4" log = "0.4" lru = "0.6" more-asserts = "0.2" natord = "1.0" -ndarray = { version = "0.13", features = ["rayon", "serde"] } -num = "0.3" +ndarray = { version = "0.15", features = ["rayon", "serde"] } +num = "0.4" piecewise-linear = "0.1" # plotly = { version = "0.6", features = ["kaleido", "plotly_ndarray"], path = "../plotly/plotly" } rand = "0.8" @@ -50,7 +50,7 @@ wgpu = "0.9" spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", features=["use-compiled-tools"] } spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu" } spirv-std-macros = { git = "https://github.com/EmbarkStudios/rust-gpu" } -spirv_backend = { path = "src/sim/spirv_backend_lib" } +spirv_backend_lib = { path = "src/sim/spirv_backend_lib" } [dev-dependencies] diff --git a/src/render.rs b/src/render.rs index babe9cd..278e4eb 100644 --- a/src/render.rs +++ b/src/render.rs @@ -3,7 +3,7 @@ use crate::real::ToFloat as _; use crate::sim::{GenericSim, Sample, StaticSim}; use crate::meas::{self, AbstractMeasurement}; use crossterm::{cursor, QueueableCommand as _}; -use crossterm::style::{style, Color, PrintStyledContent}; +use crossterm::style::{style, Color, PrintStyledContent, Stylize as _}; use font8x8::{BASIC_FONTS, GREEK_FONTS, UnicodeFonts as _}; use log::trace; use num::integer::Integer; diff --git a/src/sim/spirv.rs b/src/sim/spirv.rs index 2e9ca77..e815aaf 100644 --- a/src/sim/spirv.rs +++ b/src/sim/spirv.rs @@ -395,7 +395,7 @@ mod test { use super::*; use crate::sim::{Meters, GenericSim as _}; use crate::stim::RngStimulus; - use spirv_backend::{step_e, step_h, SerializedSimMeta, UnsizedArray, UVec3}; + use spirv_backend_lib::{step_e, step_h, SerializedSimMeta, UnsizedArray, UVec3}; fn do_step(state: &mut SimState) { let meta = SimMeta::from(state); diff --git a/src/sim/spirv_backend/Cargo.toml b/src/sim/spirv_backend/Cargo.toml index 22d8320..feeb190 100644 --- a/src/sim/spirv_backend/Cargo.toml +++ b/src/sim/spirv_backend/Cargo.toml @@ -1,7 +1,8 @@ +cargo-features = ["edition2021"] [package] name = "spirv_backend" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu", features = ["glam"] } diff --git a/src/sim/spirv_backend_lib/Cargo.toml b/src/sim/spirv_backend_lib/Cargo.toml index c735e92..4061ff3 100644 --- a/src/sim/spirv_backend_lib/Cargo.toml +++ b/src/sim/spirv_backend_lib/Cargo.toml @@ -1,7 +1,8 @@ +cargo-features = ["edition2021"] [package] -name = "spirv_backend" +name = "spirv_backend_lib" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu", features = ["glam"] }