Skip to content

Commit a1f4cbd

Browse files
hamz2awoshilapin
authored andcommitted
editoast: rename osrd_containers by editoast_common
1 parent b53633f commit a1f4cbd

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

editoast/Cargo.lock

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editoast/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
license = "LGPL-3.0"
66

77
[workspace]
8-
members = [".", "editoast_derive", "osrd_containers"]
8+
members = [".", "editoast_derive", "editoast_common"]
99

1010
[workspace.dependencies]
1111
rangemap = "1.4.0"
@@ -65,7 +65,7 @@ strum_macros = "0.25.3"
6565
thiserror = "1.0.56"
6666
enum-map = "2.7.3"
6767
editoast_derive = { path = "./editoast_derive" }
68-
osrd_containers = { path = "./osrd_containers" }
68+
editoast_common = { path = "./editoast_common" }
6969
mvt = "0.9.0"
7070
futures = "0.3.30"
7171
postgis_diesel = { version = "2.3.0", features = ["serde"] }

editoast/osrd_containers/Cargo.toml editoast/editoast_common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "osrd_containers"
2+
name = "editoast_common"
33
version = "0.1.0"
44
edition = "2021"
55

File renamed without changes.

editoast/src/views/pathfinding/electrical_profiles.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use actix_web::web::Data;
77
use actix_web::web::Json;
88
use actix_web::web::Path;
99
use actix_web::web::Query;
10-
use osrd_containers::rangemap_utils::RangedValue;
10+
use editoast_common::rangemap_utils::RangedValue;
1111
use rangemap::RangeMap;
1212
use serde::Deserialize;
1313
use serde::Serialize;
@@ -141,7 +141,7 @@ mod tests {
141141
use actix_web::test::call_service;
142142
use actix_web::test::read_body_json;
143143
use actix_web::test::TestRequest;
144-
use osrd_containers::range_map;
144+
use editoast_common::range_map;
145145
use rstest::*;
146146

147147
use super::*;

editoast/src/views/pathfinding/electrifications.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use actix_web::web::Data;
77
use actix_web::web::Json;
88
use actix_web::web::Path;
99
use chashmap::CHashMap;
10-
use osrd_containers::rangemap_utils::RangedValue;
10+
use editoast_common::rangemap_utils::RangedValue;
1111
use rangemap::RangeMap;
1212
use serde::Deserialize;
1313
use serde::Serialize;
@@ -33,7 +33,7 @@ crate::routes! {
3333

3434
crate::schemas! {
3535
ElectrificationsOnPathResponse,
36-
&osrd_containers::rangemap_utils::RangedValue,
36+
&editoast_common::rangemap_utils::RangedValue,
3737
}
3838

3939
/// Build a rangemap for each track section, giving the voltage for each range
@@ -138,7 +138,7 @@ pub mod tests {
138138
use actix_web::test::call_service;
139139
use actix_web::test::read_body_json;
140140
use actix_web::test::TestRequest;
141-
use osrd_containers::range_map;
141+
use editoast_common::range_map;
142142
use rstest::*;
143143
use serde_json::from_value;
144144
use ApplicableDirections::*;

editoast/src/views/pathfinding/path_rangemap.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::collections::HashMap;
22

3-
use osrd_containers::rangemap_utils::clip_range_map;
4-
use osrd_containers::rangemap_utils::extend_range_map;
5-
use osrd_containers::rangemap_utils::travel_range_map;
6-
use osrd_containers::rangemap_utils::Float;
7-
use osrd_containers::rangemap_utils::TravelDir;
3+
use editoast_common::rangemap_utils::clip_range_map;
4+
use editoast_common::rangemap_utils::extend_range_map;
5+
use editoast_common::rangemap_utils::travel_range_map;
6+
use editoast_common::rangemap_utils::Float;
7+
use editoast_common::rangemap_utils::TravelDir;
88
use rangemap::RangeMap;
99

1010
use crate::models::pathfinding::Pathfinding;
@@ -49,7 +49,7 @@ pub fn make_path_range_map<T: Eq + Clone>(
4949

5050
#[cfg(test)]
5151
mod tests {
52-
use osrd_containers::range_map;
52+
use editoast_common::range_map;
5353

5454
use super::*;
5555
use crate::models::pathfinding::tests::simple_pathfinding;

0 commit comments

Comments
 (0)