diff --git a/Cargo.lock b/Cargo.lock index 44c0478b..cc4bcf83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1662,7 +1662,6 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_tuple", "thiserror", "yaxpeax-arch", "yaxpeax-arm", @@ -1757,27 +1756,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_tuple" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f025b91216f15a2a32aa39669329a475733590a015835d1783549a56d09427" -dependencies = [ - "serde", - "serde_tuple_macros", -] - -[[package]] -name = "serde_tuple_macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4076151d1a2b688e25aaf236997933c66e18b870d0369f8b248b8ab2be630d7e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" diff --git a/samply-api/Cargo.toml b/samply-api/Cargo.toml index c7d4f599..f1d01638 100644 --- a/samply-api/Cargo.toml +++ b/samply-api/Cargo.toml @@ -19,7 +19,6 @@ thiserror = "1.0.26" serde = "1.0.188" serde_derive = "1.0.188" serde_json = "1.0.64" -serde_tuple = "0.5.0" yaxpeax-arch = { version = "0.2.7", default-features = false } yaxpeax-x86 = { version = "1.1.4", default-features = false, features = ["std", "fmt"] } yaxpeax-arm = { version = "0.2.3", default-features = false, features = ["std"] } diff --git a/samply-api/src/asm/response_json.rs b/samply-api/src/asm/response_json.rs index 5e89fd42..6d39975f 100644 --- a/samply-api/src/asm/response_json.rs +++ b/samply-api/src/asm/response_json.rs @@ -1,4 +1,5 @@ -use serde::{ser::SerializeSeq, Serialize}; +use serde::ser::SerializeSeq; +use serde_derive::Serialize; #[derive(Serialize, Debug)] #[serde(rename_all = "camelCase")] @@ -36,7 +37,7 @@ pub struct DecodedInstruction { pub decoded_string_per_syntax: Vec, } -impl Serialize for DecodedInstruction { +impl serde::Serialize for DecodedInstruction { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, diff --git a/samply-api/src/source/response_json.rs b/samply-api/src/source/response_json.rs index 10e3d5c8..55e4081e 100644 --- a/samply-api/src/source/response_json.rs +++ b/samply-api/src/source/response_json.rs @@ -1,4 +1,4 @@ -use serde::Serialize; +use serde_derive::Serialize; #[derive(Serialize, Debug)] #[serde(rename_all = "camelCase")]