editoast: do not depend directly on 'serde_derive'

`serde_derive` can be used through the feature `derive` on the `serde` crate. It will keep the two version number in sync (note: resolver probably do that anyway 🤷).
OpenRailAssociation · Aug 29, 2024 · 87418f1 · 87418f1
1 parent fe6fb65
commit 87418f1
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 33 deletions.
diff --git a/editoast/Cargo.lock b/editoast/Cargo.lock
diff --git a/editoast/Cargo.toml b/editoast/Cargo.toml
@@ -58,8 +58,7 @@ pretty_assertions = "1.4.0"
 rand = "0.8.5"
 rangemap = "1.5.1"
 rstest = { version = "0.19.0", default-features = false }
-serde = "1.0.204"
-serde_derive = "1.0.195"
+serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.121"
 strum = { version = "0.26.3", features = ["derive"] }
 tempfile = "3.10.1"
@@ -148,8 +147,7 @@ hostname.workspace = true
 lapin = "2.3.1"
 ordered-float = { version = "4.2.2", features = ["serde"] }
 reqwest = { version = "0.11.27", default-features = false, features = ["json"] }
-serde.workspace = true
-serde_derive.workspace = true
+serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 serde_qs = { version = "0.13.0", features = ["axum"] }
 serde_yaml = "0.9.34"

diff --git a/editoast/editoast_common/Cargo.toml b/editoast/editoast_common/Cargo.toml
@@ -8,8 +8,7 @@ edition.workspace = true
 
 [dependencies]
 rangemap.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
+serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 thiserror.workspace = true
 utoipa.workspace = true

diff --git a/editoast/editoast_common/src/geometry.rs b/editoast/editoast_common/src/geometry.rs
@@ -1,5 +1,5 @@
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 
 crate::schemas! {

diff --git a/editoast/editoast_common/src/rangemap_utils.rs b/editoast/editoast_common/src/rangemap_utils.rs
@@ -1,5 +1,6 @@
 use rangemap::RangeMap;
-use serde_derive::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use std::fmt::Debug;
 use std::ops::Range;
 use utoipa::ToSchema;

diff --git a/editoast/editoast_schemas/src/train_schedule/margins.rs b/editoast/editoast_schemas/src/train_schedule/margins.rs
@@ -2,7 +2,8 @@ use std::str::FromStr;
 
 use crate::primitives::NonBlankString;
 use derivative::Derivative;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 
 editoast_common::schemas! {

diff --git a/editoast/src/core/infra_state.rs b/editoast/src/core/infra_state.rs
@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use derivative::Derivative;
+use serde::Deserialize;
 use serde::Serialize;
-use serde_derive::Deserialize;
 
 use super::AsCoreRequest;
 use super::Json;

diff --git a/editoast/src/core/mod.rs b/editoast/src/core/mod.rs
@@ -24,8 +24,8 @@ pub use http_client::HttpClient;
 pub use http_client::HttpClientBuilder;
 use reqwest::Url;
 use serde::de::DeserializeOwned;
+use serde::Deserialize;
 use serde::Serialize;
-use serde_derive::Deserialize;
 use serde_json::Value;
 use thiserror::Error;
 use tracing::debug;
@@ -458,7 +458,7 @@ mod test {
     use axum::http::StatusCode;
     use pretty_assertions::assert_eq;
     use reqwest::Method;
-    use serde_derive::Serialize;
+    use serde::Serialize;
     use serde_json::json;
 
     use crate::core::mocking::MockingClient;

diff --git a/editoast/src/core/simulation.rs b/editoast/src/core/simulation.rs
@@ -2,8 +2,8 @@ use editoast_schemas::rolling_stock::RollingStock;
 use editoast_schemas::rolling_stock::RollingStockComfortType;
 use editoast_schemas::train_schedule::Allowance;
 use editoast_schemas::train_schedule::RjsPowerRestrictionRange;
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 
 use super::AsCoreRequest;

diff --git a/editoast/src/error.rs b/editoast/src/error.rs
@@ -7,7 +7,8 @@ use editoast_models::db_connection_pool::DatabasePoolBuildError;
 use editoast_models::db_connection_pool::DatabasePoolError;
 use editoast_models::DatabaseError;
 use redis::RedisError;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use serde_json::{json, Value};
 use std::backtrace::Backtrace;
 use std::collections::HashMap;

diff --git a/editoast/src/modelsv2/scenario.rs b/editoast/src/modelsv2/scenario.rs
@@ -3,8 +3,8 @@ use diesel::ExpressionMethods;
 use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
 use editoast_derive::ModelV2;
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 
 use crate::error::Result;

diff --git a/editoast/src/views/documents.rs b/editoast/src/views/documents.rs
@@ -6,7 +6,7 @@ use axum::http::StatusCode;
 use axum::response::IntoResponse;
 use axum::Json;
 use editoast_derive::EditoastError;
-use serde_derive::Serialize;
+use serde::Serialize;
 use thiserror::Error;
 use utoipa::ToSchema;
 

diff --git a/editoast/src/views/infra/attached.rs b/editoast/src/views/infra/attached.rs
@@ -6,7 +6,7 @@ use axum::extract::State;
 use axum::Extension;
 use editoast_authz::BuiltinRole;
 use editoast_derive::EditoastError;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use thiserror::Error;
 
 use crate::error::Result;

diff --git a/editoast/src/views/mod.rs b/editoast/src/views/mod.rs
@@ -43,8 +43,8 @@ use axum::extract::State;
 use editoast_derive::EditoastError;
 use editoast_models::db_connection_pool::ping_database;
 use editoast_models::DbConnectionPoolV2;
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use thiserror::Error;
 use tokio::time::timeout;
 use utoipa::ToSchema;

diff --git a/editoast/src/views/rolling_stocks/mod.rs b/editoast/src/views/rolling_stocks/mod.rs
@@ -23,8 +23,8 @@ use image::ImageBuffer;
 use image::ImageFormat;
 use image::ImageReader;
 use rolling_stock_form::RollingStockForm;
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use strum::Display;
 use thiserror::Error;
 use utoipa::IntoParams;

diff --git a/editoast/src/views/rolling_stocks/rolling_stock_form.rs b/editoast/src/views/rolling_stocks/rolling_stock_form.rs
@@ -8,8 +8,8 @@ use editoast_schemas::rolling_stock::RollingResistance;
 use editoast_schemas::rolling_stock::RollingStockMetadata;
 use editoast_schemas::rolling_stock::RollingStockSupportedSignalingSystems;
 use editoast_schemas::rolling_stock::ROLLING_STOCK_RAILJSON_VERSION;
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 use validator::Validate;
 use validator::ValidationError;

diff --git a/editoast/src/views/single_simulation.rs b/editoast/src/views/single_simulation.rs
@@ -4,8 +4,8 @@ use editoast_derive::EditoastError;
 use editoast_schemas::rolling_stock::RollingStockComfortType;
 use editoast_schemas::train_schedule::Allowance;
 use editoast_schemas::train_schedule::RjsPowerRestrictionRange;
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use std::ops::DerefMut;
 use thiserror::Error;
 use utoipa::ToSchema;

diff --git a/editoast/src/views/train_schedule/mod.rs b/editoast/src/views/train_schedule/mod.rs
@@ -24,8 +24,8 @@ use editoast_schemas::rolling_stock::RollingStockComfortType;
 use editoast_schemas::train_schedule::Allowance;
 use editoast_schemas::train_schedule::RjsPowerRestrictionRange;
 use itertools::izip;
+use serde::Deserialize;
 use serde::Serialize;
-use serde_derive::Deserialize;
 use simulation_report::SimulationReport;
 use thiserror::Error;
 use utoipa::IntoParams;

diff --git a/editoast/src/views/train_schedule/simulation_report.rs b/editoast/src/views/train_schedule/simulation_report.rs
@@ -5,8 +5,8 @@ use diesel::ExpressionMethods;
 use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
 use futures::future::OptionFuture;
-use serde_derive::Deserialize;
-use serde_derive::Serialize;
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 
 use crate::core::simulation::SignalProjectionRequest;