reorder serde usage/derive

this is deprecated with rustc 1.52+, and will become a hard error at
some point:

https://github.com/rust-lang/rust/issues/79202

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs
index 48aba5610a59353f8011c73364f40162bebc438c..2838a6098ee54f21db457566cf73f13a7ff402bf 100644 (file)
--- a/src/api2/types/mod.rs
+++ b/src/api2/types/mod.rs
@@ -1548,8 +1548,8 @@ impl std::convert::TryFrom<openssl::rsa::Rsa<openssl::pkey::Public>> for RsaPubK
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Default)]
+#[serde(rename_all="kebab-case")]
 /// Job Scheduling Status
 pub struct JobScheduleStatus {
     #[serde(skip_serializing_if="Option::is_none")]

diff --git a/src/config/datastore.rs b/src/config/datastore.rs
index 7b16ab1469df5e77029048d7e8ed4bc009af51fe..673033a08de222e6afe7af167517b2a143ad4253 100644 (file)
--- a/src/config/datastore.rs
+++ b/src/config/datastore.rs
@@ -82,8 +82,8 @@ pub const DIR_NAME_SCHEMA: Schema = StringSchema::new("Directory name").schema()
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Datastore configuration properties.
 pub struct DataStoreConfig {
     pub name: String,

diff --git a/src/config/sync.rs b/src/config/sync.rs
index 33bec113b152364abe1f2e47f4505614ff0429e5..2fd3a2c10f6bbc48172ccc3014ccee47f44153b1 100644 (file)
--- a/src/config/sync.rs
+++ b/src/config/sync.rs
@@ -53,8 +53,8 @@ lazy_static! {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="kebab-case")]
 /// Sync Job
 pub struct SyncJobConfig {
     pub id: String,
@@ -82,8 +82,8 @@ pub struct SyncJobConfig {
     },
 )]
 
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Status of Sync Job
 pub struct SyncJobStatus {
     #[serde(flatten)]

diff --git a/src/config/tape_job.rs b/src/config/tape_job.rs
index f9c6205d8ef6b60fb93c04aa2ede2f873e23389a..a5901e86c9a37a6c9f43839e78dabb53417f53d9 100644 (file)
--- a/src/config/tape_job.rs
+++ b/src/config/tape_job.rs
@@ -62,8 +62,8 @@ lazy_static! {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="kebab-case")]
 /// Tape Backup Job Setup
 pub struct TapeBackupJobSetup {
     pub store: String,
@@ -98,8 +98,8 @@ pub struct TapeBackupJobSetup {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="kebab-case")]
 /// Tape Backup Job
 pub struct TapeBackupJobConfig {
     pub id: String,
@@ -121,8 +121,8 @@ pub struct TapeBackupJobConfig {
         },
     },
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Status of Tape Backup Job
 pub struct TapeBackupJobStatus {
     #[serde(flatten)]

diff --git a/src/config/token_shadow.rs b/src/config/token_shadow.rs
index 26516454e3e9401c7512d63119d8a2237539f01e..14acdbebd85d60d233fb3a02e70734ace030950b 100644 (file)
--- a/src/config/token_shadow.rs
+++ b/src/config/token_shadow.rs
@@ -14,8 +14,8 @@ const LOCK_FILE: &str = configdir!("/token.shadow.lock");
 const CONF_FILE: &str = configdir!("/token.shadow");
 const LOCK_TIMEOUT: Duration = Duration::from_secs(5);
 
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize, Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// ApiToken id / secret pair
 pub struct ApiTokenSecret {
     pub tokenid: Authid,

diff --git a/src/config/verify.rs b/src/config/verify.rs
index 07b5b7eec5fbea3e4b7d2d0cc7ba5e61ff7f77f6..549f9801a08ec034f78d565c9929caa7577cafc0 100644 (file)
--- a/src/config/verify.rs
+++ b/src/config/verify.rs
@@ -48,8 +48,8 @@ lazy_static! {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Verification Job
 pub struct VerificationJobConfig {
     /// unique ID to address this job
@@ -80,8 +80,8 @@ pub struct VerificationJobConfig {
         },
     },
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Status of Verification Job
 pub struct VerificationJobStatus {
     #[serde(flatten)]

diff --git a/src/server/jobstate.rs b/src/server/jobstate.rs
index 30029bfdd7235772b67da883f262e4500b79c7a7..96dd21aacbc64ba199fc869ffeacf1ea553b0f7d 100644 (file)
--- a/src/server/jobstate.rs
+++ b/src/server/jobstate.rs
@@ -61,8 +61,8 @@ use crate::{
     },
 };
 
-#[serde(rename_all = "kebab-case")]
 #[derive(Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 /// Represents the State of a specific Job
 pub enum JobState {
     /// A job was created at 'time', but never started/finished