Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
aschey committed Oct 5, 2024
1 parent 3f9c163 commit c84e98f
Show file tree
Hide file tree
Showing 35 changed files with 776 additions and 848 deletions.
808 changes: 391 additions & 417 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions libplatune/management/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ walkdir = "2"
[dev-dependencies]
criterion = { version = "0.5.1", features = ["async_tokio"] }
ctor = "0.2.8"
pretty_assertions = "1.4.0"
rstest = "0.22.0"
tempfile = "3.10.1"
pretty_assertions = "1.4.1"
rstest = "0.23.0"
tempfile = "3.13.0"
tracing-subscriber = "0.3.18"
2 changes: 1 addition & 1 deletion libplatune/management/benches/bench.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::time::Duration;

use criterion::{criterion_group, criterion_main, Criterion};
use criterion::{Criterion, criterion_group, criterion_main};

fn from_elem(c: &mut Criterion) {
let mut group = c.benchmark_group("default");
Expand Down
4 changes: 2 additions & 2 deletions libplatune/management/src/config/file_config.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use std::fs::{create_dir_all, File};
use std::fs::{File, create_dir_all};
use std::io::{Read, Write};
use std::path::{Path, PathBuf};

use eyre::{Context, Result};
use uuid::Uuid;

use super::config_error::ConfigError;
use super::Config;
use super::config_error::ConfigError;

static CONFIG_FILE: &str = "drive_id";

Expand Down
4 changes: 2 additions & 2 deletions libplatune/management/src/file_watch_manager.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use std::ops::Deref;
use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
use std::time::Duration;

use futures::StreamExt;
use notify::event::{EventKind, ModifyKind, RenameMode};
use notify::{RecommendedWatcher, RecursiveMode, Watcher};
use tap::TapFallible;
use thiserror::Error;
use tokio::sync::{broadcast, mpsc, Mutex, RwLock};
use tokio::sync::{Mutex, RwLock, broadcast, mpsc};
use tracing::{error, info, warn};

use crate::db_error::DbError;
Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/file_watch_manager_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::time::Duration;
use itertools::Itertools;
use pretty_assertions::assert_eq;
use rstest::*;
use tempfile::{tempdir, TempDir};
use tempfile::{TempDir, tempdir};
use tokio::sync::mpsc;
use tokio::time::timeout;
use tracing::Level;
Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::config::Config;
use crate::database::{Database, DeletedEntry, LookupEntry};
use crate::db_error::DbError;
pub use crate::entry_type::EntryType;
use crate::path_util::{clean_file_path, update_path, PathMut};
use crate::path_util::{PathMut, clean_file_path, update_path};
pub use crate::search::search_options::SearchOptions;
pub use crate::search::search_result::SearchResult;
use crate::sync::progress_stream::ProgressStream;
Expand Down
4 changes: 2 additions & 2 deletions libplatune/management/src/manager_test.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::fs;
use std::path::{PathBuf, MAIN_SEPARATOR};
use std::path::{MAIN_SEPARATOR, PathBuf};
use std::sync::Arc;

use normpath::PathExt;
use pretty_assertions::assert_eq;
use tempfile::{tempdir, TempDir};
use tempfile::{TempDir, tempdir};

use super::Manager;
use crate::config::MemoryConfig;
Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/search/queries.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ pub(crate) fn replace_ampersand(string: &str) -> String {
fn replace_special_chars(query: &str) -> String {
// Replace all special characters with whitespace because they cause sqlite to error
let special_chars = Regex::new(r"[^A-Za-z0-9&\*\s]").unwrap();
return special_chars.replace_all(query, " ").trim().to_owned();
special_chars.replace_all(query, " ").trim().to_owned()
}

fn get_spellfix_query(index: usize) -> String {
Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/search/search_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pub struct SearchOptions<'a> {
pub valid_entry_types: Vec<&'a str>,
}

impl<'a> Default for SearchOptions<'a> {
impl Default for SearchOptions<'_> {
fn default() -> Self {
Self {
start_highlight: "",
Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/search/search_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use lofty::tag::{Accessor, ItemKey, TagExt};
use pretty_assertions::assert_eq;
use rstest::*;
use tempfile::TempDir;
use tracing::{info, Level};
use tracing::{Level, info};

use crate::config::MemoryConfig;
use crate::database::Database;
Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/sync/progress_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::task::{Context, Poll};

use futures::StreamExt;
use tokio::sync::broadcast;
use tokio_stream::wrappers::errors::BroadcastStreamRecvError;
use tokio_stream::wrappers::BroadcastStream;
use tokio_stream::wrappers::errors::BroadcastStreamRecvError;

use super::sync_engine::SyncError;

Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/sync/sync_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use tap::TapFallible;
use thiserror::Error;
use tokio::sync::broadcast;
use tokio::sync::mpsc::{self, Sender};
use tokio::task::{spawn_blocking, JoinHandle};
use tokio::task::{JoinHandle, spawn_blocking};
use tracing::{error, info};
use walkdir::WalkDir;

Expand Down
2 changes: 1 addition & 1 deletion libplatune/management/src/sync/sync_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::fs::{self, create_dir, create_dir_all, File};
use std::fs::{self, File, create_dir, create_dir_all};
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::time::Duration;
Expand Down
12 changes: 6 additions & 6 deletions libplatune/player/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ derivative = "2"
eyre = "0.6"
flume = "0.11"
futures-util = "0.3"
stream-download = { version = "0.8.0", features = ["reqwest-rustls"] }
stream-download = { version = "0.9.0", features = ["reqwest-rustls"] }
strum = { version = "0.26", features = ["derive"] }
tap = "1"
thiserror = "1"
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
tracing = "0.1"
decal = { git = "https://github.com/aschey/decal", rev = "62c120870325d6b4631e418c35b6e58116999dcb" }
decal = { git = "https://github.com/aschey/decal", rev = "c5aeea56f7823ca0eb38981cd8d43bd192101437" }

[dev-dependencies]
assert_matches = "1.5.0"
async-trait = "0.1.81"
async-trait = "0.1.83"
ctor = "0.2.8"
futures = "0.3.30"
pretty_assertions = "1.4.0"
rstest = "0.22.0"
spin_sleep = "1.2.0"
pretty_assertions = "1.4.1"
rstest = "0.23.0"
spin_sleep = "1.2.1"
tracing-appender = "0.2.3"
tracing-subscriber = "0.3.18"
Loading

0 comments on commit c84e98f

Please sign in to comment.