Skip to content

Commit

Permalink
fix: Use serde_derive via serde's derive feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Nukesor committed Oct 19, 2024
1 parent 32532dc commit 92af798
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 12 deletions.
2 changes: 0 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ rust-version = "1.70"
chrono = { version = "0.4", features = ["serde"] }
command-group = "5"
log = "0.4"
serde = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_yaml = "0.9"
serde_derive = "1.0"
snap = "1.1"
strum = "0.26"
strum_macros = "0.26"
Expand Down
1 change: 0 additions & 1 deletion pueue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ pest = "2.7"
pest_derive = "2.7"
pueue-lib = { version = "0.26.1", path = "../pueue_lib" }
serde = { workspace = true }
serde_derive = { workspace = true }
serde_json = { workspace = true }
shell-escape = "0.1"
simplelog = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion pueue/src/client/display/log/json.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::{BTreeMap, HashMap};
use std::io::Read;

use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use snap::read::FrameDecoder;

use pueue_lib::log::{get_log_file_handle, read_last_lines};
Expand Down
2 changes: 1 addition & 1 deletion pueue/tests/client/integration/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::{BTreeMap, HashMap};
use anyhow::{Context, Result};
use pueue_lib::task::Task;
use rstest::rstest;
use serde_derive::Deserialize;
use serde::Deserialize;

use crate::client::helper::*;

Expand Down
1 change: 0 additions & 1 deletion pueue_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ rustls = { version = "0.23", features = [
rustls-pemfile = "2"
serde = { workspace = true }
serde_cbor = "0.11"
serde_derive = { workspace = true }
serde_json = { workspace = true }
serde_yaml = "0.9"
shellexpand = "3.1"
Expand Down
2 changes: 1 addition & 1 deletion pueue_lib/src/network/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::{BTreeMap, HashMap};
use std::path::PathBuf;

use chrono::prelude::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use strum_macros::{Display, EnumString};

use crate::state::{Group, State};
Expand Down
2 changes: 1 addition & 1 deletion pueue_lib/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::io::{prelude::*, BufReader};
use std::path::{Path, PathBuf};

use log::info;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use shellexpand::tilde;

use crate::error::Error;
Expand Down
2 changes: 1 addition & 1 deletion pueue_lib/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::BTreeMap;
use std::process::Child;
use std::sync::{Arc, Mutex};

use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};

use crate::children::Children;
use crate::error::Error;
Expand Down
2 changes: 1 addition & 1 deletion pueue_lib/src/task.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{collections::HashMap, path::PathBuf};

use chrono::prelude::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use strum_macros::Display;

use crate::state::PUEUE_DEFAULT_GROUP;
Expand Down

0 comments on commit 92af798

Please sign in to comment.