Skip to content

Commit

Permalink
Update dependencies (#708)
Browse files Browse the repository at this point in the history
  • Loading branch information
ciscorn authored Feb 23, 2025
1 parent 1da7050 commit 7a200a7
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion app/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ nusamai-plateau = { path = "../../nusamai-plateau" }
nusamai-citygml = {path = "../../nusamai-citygml" }
log = "0.4.22"
tauri-plugin-log = "2.0.3"
thiserror = "1.0.69"
thiserror = "2.0.11"
tauri-plugin-fs = "2.1.0"
tauri-plugin-shell = "2.0.2"
tauri-plugin-dialog = "2.0.4"
Expand Down
2 changes: 1 addition & 1 deletion nusamai-citygml/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ nusamai-projection = { path = "../nusamai-projection"}
quick-xml = "0.37.1"
serde = { version = "1.0", features = ["derive"], optional = true }
serde_json = { version = "1.0.133", features = ["indexmap"], optional = true }
thiserror = "1.0"
thiserror = "2"
url = { version = "2.5.4", features = ["serde"] }
2 changes: 1 addition & 1 deletion nusamai-gpkg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio"] }
flatgeom = "0.0"
thiserror = "1.0.69"
thiserror = "2"
url = "2.5.4"
indexmap = "2.7.0"

Expand Down
2 changes: 1 addition & 1 deletion nusamai-projection/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"

[dependencies]
japan-geoid = "0.4.1"
thiserror = "1.0.69"
thiserror = "2"
10 changes: 5 additions & 5 deletions nusamai/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ nusamai-plateau = { path = "../nusamai-plateau" }
nusamai-citygml = { path = "../nusamai-citygml" }
quick-xml = "0.37.1"
clap = { version = "4.5.21", features = ["derive", "string"] }
thiserror = "1.0.69"
thiserror = "2"
ctrlc = "3.4.5"
bincode = { version = "2.0.0-rc.3", default-features = false, features = ["std", "serde"] }
lz4_flex = "0.11.3"
Expand All @@ -22,7 +22,7 @@ cesiumtiles = { git = "https://github.com/MIERUNE/cesiumtiles-rs.git" }
flatgeom = { version = "0.0", features = ["serde"] }
nusamai-czml = { path = "../nusamai-czml" }
nusamai-projection = { path = "../nusamai-projection" }
tinymvt = "0.0.1"
tinymvt = "0.0.3"
fastanvil = "0.31.0"
fastnbt = "2.5.0"
geojson = "0.24.1"
Expand All @@ -34,7 +34,7 @@ byteorder = "1.5.0"
hashbrown = { version = "0.15.2", features = ["serde"] }
log = { version = "0.4.22" }
pretty_env_logger = "0.5.0"
itertools = "0.13"
itertools = "0.14"
prost = "0.13.3"
bytesize = "1.3.0"
ahash = "0.8.11"
Expand All @@ -54,10 +54,10 @@ dda-voxelize = "0.2.0-alpha.1"
atlas-packer = { git = "https://github.com/MIERUNE/atlas-packer.git" }
# atlas-packer = { path = "../atlas_packer" };
tempfile = "3.14.0"
glam = "0.29.2"
glam = "0.30"

[dev-dependencies]
rand = "0.8.5"
rand = "0.9.0"
tokio = { version = "1.41", features = ["full"] }
byteorder = "1.5.0"
glob = "0.3.1"
Expand Down
6 changes: 4 additions & 2 deletions nusamai/tests/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ impl DataSource for DummySource {
}

fn run(&mut self, sink: Sender, feedback: &Feedback) -> Result<()> {
let mut rng = rand::rng();
for _i in 0..100 {
feedback.ensure_not_canceled()?;
std::thread::sleep(std::time::Duration::from_millis(
(5.0 + random::<f32>() * 10.0) as u64,
(5.0 + rng.random::<f32>() * 10.0) as u64,
));
let obj = Parcel {
entity: Entity {
Expand Down Expand Up @@ -104,11 +105,12 @@ struct DummySink {}

impl DataSink for DummySink {
fn run(&mut self, upstream: Receiver, feedback: &Feedback, _schema: &Schema) -> Result<()> {
let mut rng = rand::rng();
for parcel in upstream {
feedback.ensure_not_canceled()?;

std::thread::sleep(std::time::Duration::from_millis(
(5.0 + random::<f32>() * 20.0) as u64,
(5.0 + rng.random::<f32>() * 20.0) as u64,
));
feedback.info(format!("dummy sink received: {:?}", parcel))
}
Expand Down

0 comments on commit 7a200a7

Please sign in to comment.