Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

editoast: Rename osrd_containers by editoast_common #7066

Merged
merged 1 commit into from
Apr 2, 2024
Merged

editoast: Rename osrd_containers by editoast_common #7066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions editoast/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions editoast/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
license = "LGPL-3.0"

[workspace]
members = [".", "editoast_derive", "osrd_containers"]
members = [".", "editoast_derive", "editoast_common"]

[workspace.dependencies]
rangemap = "1.4.0"
Expand Down Expand Up @@ -65,7 +65,7 @@ strum_macros = "0.25.3"
thiserror = "1.0.56"
enum-map = "2.7.3"
editoast_derive = { path = "./editoast_derive" }
osrd_containers = { path = "./osrd_containers" }
editoast_common = { path = "./editoast_common" }
mvt = "0.9.0"
futures = "0.3.30"
postgis_diesel = { version = "2.3.0", features = ["serde"] }
Expand Down
2 changes: 1 addition & 1 deletion editoast/osrd_containers/Cargo.toml → editoast/editoast_common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "osrd_containers"
name = "editoast_common"
version = "0.1.0"
edition = "2021"

Expand Down
0 editoast/osrd_containers/src/lib.rs → editoast/editoast_common/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...ast/osrd_containers/src/rangemap_utils.rs → ...ast/editoast_common/src/rangemap_utils.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions editoast/src/views/pathfinding/electrical_profiles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use actix_web::web::Data;
use actix_web::web::Json;
use actix_web::web::Path;
use actix_web::web::Query;
use osrd_containers::rangemap_utils::RangedValue;
use editoast_common::rangemap_utils::RangedValue;
use rangemap::RangeMap;
use serde::Deserialize;
use serde::Serialize;
Expand Down Expand Up @@ -141,7 +141,7 @@ mod tests {
use actix_web::test::call_service;
use actix_web::test::read_body_json;
use actix_web::test::TestRequest;
use osrd_containers::range_map;
use editoast_common::range_map;
use rstest::*;

use super::*;
Expand Down
6 changes: 3 additions & 3 deletions editoast/src/views/pathfinding/electrifications.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use actix_web::web::Data;
use actix_web::web::Json;
use actix_web::web::Path;
use chashmap::CHashMap;
use osrd_containers::rangemap_utils::RangedValue;
use editoast_common::rangemap_utils::RangedValue;
use rangemap::RangeMap;
use serde::Deserialize;
use serde::Serialize;
Expand All @@ -33,7 +33,7 @@ crate::routes! {

crate::schemas! {
ElectrificationsOnPathResponse,
&osrd_containers::rangemap_utils::RangedValue,
&editoast_common::rangemap_utils::RangedValue,
}

/// Build a rangemap for each track section, giving the voltage for each range
Expand Down Expand Up @@ -138,7 +138,7 @@ pub mod tests {
use actix_web::test::call_service;
use actix_web::test::read_body_json;
use actix_web::test::TestRequest;
use osrd_containers::range_map;
use editoast_common::range_map;
use rstest::*;
use serde_json::from_value;
use ApplicableDirections::*;
Expand Down
12 changes: 6 additions & 6 deletions editoast/src/views/pathfinding/path_rangemap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::collections::HashMap;

use osrd_containers::rangemap_utils::clip_range_map;
use osrd_containers::rangemap_utils::extend_range_map;
use osrd_containers::rangemap_utils::travel_range_map;
use osrd_containers::rangemap_utils::Float;
use osrd_containers::rangemap_utils::TravelDir;
use editoast_common::rangemap_utils::clip_range_map;
use editoast_common::rangemap_utils::extend_range_map;
use editoast_common::rangemap_utils::travel_range_map;
use editoast_common::rangemap_utils::Float;
use editoast_common::rangemap_utils::TravelDir;
use rangemap::RangeMap;

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

#[cfg(test)]
mod tests {
use osrd_containers::range_map;
use editoast_common::range_map;

use super::*;
use crate::models::pathfinding::tests::simple_pathfinding;
Expand Down
Loading