Update dependencies

tversteeg · Aug 27, 2022 · 2f2ab9b · 2f2ab9b
1 parent 861e926
commit 2f2ab9b
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 106 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bnk/Cargo.toml b/crates/bnk/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 nom = "7.1.1"
 profiling = { version = "1.0.6", optional = true }
-thiserror = "1.0.31"
+thiserror = "1.0.32"
 
 [features]
 profile-with-puffin = ["profiling/profile-with-puffin"]

diff --git a/crates/psarc/Cargo.toml b/crates/psarc/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 nom = "7.1.1"
-semver = "1.0.12"
-thiserror = "1.0.31"
+semver = "1.0.13"
+thiserror = "1.0.32"
 aes = "0.8.1"
 cfb-mode = "0.8.1"
 hex-literal = "0.3.4"

diff --git a/crates/rockysmithereens_parser/Cargo.toml b/crates/rockysmithereens_parser/Cargo.toml
@@ -8,9 +8,9 @@ psarc = { path = "../psarc" }
 rodio_wem = { path = "../rodio_wem" }
 bnk = { path = "../bnk" }
 quick-xml = { version = "0.23.0", features = ["serialize"] }
-serde = { version = "1.0.139", features = ["derive"] }
-serde_json = "1.0.82"
-thiserror = "1.0.31"
+serde = { version = "1.0.144", features = ["derive"] }
+serde_json = "1.0.85"
+thiserror = "1.0.32"
 profiling = "1.0.6"
 
 [features]

diff --git a/crates/rodio_wem/Cargo.toml b/crates/rodio_wem/Cargo.toml
@@ -11,7 +11,7 @@ lewton = { git = "https://github.com/tversteeg/lewton.git", branch = "clone" }
 nom = "7.1.1"
 profiling = { version = "1.0.6", optional = true }
 rodio = { version = "0.15.0", default-features = false, features = ["vorbis"] }
-thiserror = "1.0.31"
+thiserror = "1.0.32"
 
 [features]
 profile-with-puffin = ["profiling/profile-with-puffin"]

diff --git a/rockysmithereens/Cargo.toml b/rockysmithereens/Cargo.toml
@@ -7,10 +7,10 @@ default-run = "rockysmithereens"
 [dependencies]
 rodio_wem = { path = "../crates/rodio_wem", features = ["profile-with-tracing"] }
 rockysmithereens_parser = { path = "../crates/rockysmithereens_parser", features = ["profile-with-tracing"] }
-anyhow = "1.0.61"
-bevy = { version = "0.8.0", features = ["dds"] }
+anyhow = "1.0.62"
+bevy = { version = "0.8.1", features = ["dds"] }
 bevy_egui = "0.16.0"
-clap = { version = "3.2.12", features = ["derive"] }
+clap = { version = "3.2.17", features = ["derive"] }
 rfd = "0.10.0"
 lazy_static = "1.4.0"
 rodio = { version = "0.15.0", default-features = false }

diff --git a/rockysmithereens/src/ui/tab_view.rs b/rockysmithereens/src/ui/tab_view.rs
@@ -2,7 +2,7 @@ use crate::player::{MusicController, NOTE_SPAWN_TIME};
 use bevy::prelude::{Local, Res, ResMut};
 use bevy_egui::{
     egui::{
-        plot::{Line, Plot, Text, VLine, Value, Values},
+        plot::{Line, Plot, Text, VLine},
         Color32, TextStyle, TopBottomPanel,
     },
     EguiContext,
@@ -57,44 +57,47 @@ pub fn ui(
                     notes.for_each(|note| {
                         // Get the starting position of the note
                         let x = note.time - time_playing_secs;
-                        let pos = Value::new(
-                            x,
-                            note.string as f32
-                                + note.bend.map(|bend| bend.0 * BEND_FACTOR).unwrap_or(0.0),
-                        );
+                        let pos = [
+                            x as f64,
+                            note.string as f64
+                                + note.bend.map(|bend| bend.0 * BEND_FACTOR).unwrap_or(0.0) as f64,
+                        ];
                         let color = string_number_to_color(note.string);
 
                         // Draw a line when a sustain is played
                         if let Some(sustain) = note.sustain {
                             // Add the bend if applicable
                             let second_pos = match note.bend {
-                                Some((_, end_bend)) => Value::new(
-                                    x + sustain,
-                                    note.string as f32 + end_bend * BEND_FACTOR,
-                                ),
-                                None => Value::new(x + sustain, note.string as f32),
+                                Some((_, end_bend)) => [
+                                    (x + sustain) as f64,
+                                    note.string as f64 + (end_bend * BEND_FACTOR) as f64,
+                                ],
+                                None => [(x + sustain) as f64, note.string as f64],
                             };
 
                             plot_ui.line(
-                                Line::new(Values::from_values(vec![pos, second_pos]))
+                                Line::new(vec![pos.into(), second_pos.into()])
                                     .color(color)
                                     .width(1.0),
                             );
                         }
 
                         // Draw an X when it's a mute
                         if note.mute {
-                            plot_ui.text(Text::new(pos, "X").color(Color32::GRAY));
+                            plot_ui.text(Text::new(pos.into(), "X").color(Color32::GRAY));
                         }
 
                         // Draw the number for the note if it's not an intermediate note
                         if note.show {
                             if note.slide_to_next {
                                 // Draw slides differently
-                                plot_ui
-                                    .text(Text::new(pos, format!("{}>", note.fret)).color(color));
+                                plot_ui.text(
+                                    Text::new(pos.into(), format!("{}>", note.fret)).color(color),
+                                );
                             } else {
-                                plot_ui.text(Text::new(pos, format!("{}", note.fret)).color(color));
+                                plot_ui.text(
+                                    Text::new(pos.into(), format!("{}", note.fret)).color(color),
+                                );
                             }
                         }
                     });

diff --git a/tools/cli_music_player/Cargo.toml b/tools/cli_music_player/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 rodio_wem = { path = "../../crates/rodio_wem" }
 rockysmithereens_parser = { path = "../../crates/rockysmithereens_parser" }
 
-anyhow = "1.0.61"
-clap = { version = "3.2.12", features = ["derive"] }
+anyhow = "1.0.62"
+clap = { version = "3.2.17", features = ["derive"] }
 env_logger = "0.9.0"
 rodio = { version = "0.15.0", default-features = false, features = ["lewton", "vorbis"] }
diff --git a/tools/psarc_extract/Cargo.toml b/tools/psarc_extract/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.61"
-clap = { version = "3.2.12", features = ["derive"] }
+anyhow = "1.0.62"
+clap = { version = "3.2.17", features = ["derive"] }
 env_logger = "0.9.0"
 log = "0.4.17"
 psarc = { path = "../../crates/psarc" }