From cbf4e8f2f53220e2fe40b38ac207a13be304230e Mon Sep 17 00:00:00 2001
From: Vincent Lafeychine <vincent.lafeychine@proton.me>
Date: Sun, 11 Feb 2024 16:20:59 +0100
Subject: [PATCH] chore(cargo): Use workspace for member paths
---
rr_frontend/Cargo.toml | 14 +++++++++++---
rr_frontend/analysis/Cargo.toml | 3 ++-
rr_frontend/radium/Cargo.toml | 3 ++-
rr_frontend/refinedrust_frontend/Cargo.toml | 9 ++++-----
rr_frontend/translation/Cargo.toml | 13 ++++++-------
5 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/rr_frontend/Cargo.toml b/rr_frontend/Cargo.toml
index d120b87a..52b35df1 100644
--- a/rr_frontend/Cargo.toml
+++ b/rr_frontend/Cargo.toml
@@ -1,11 +1,19 @@
[workspace]
members = [
"analysis",
- "translation",
- "rr_rustc_interface",
"annotations",
"attribute_parse",
"radium",
+ "refinedrust_frontend",
+ "rr_rustc_interface",
"rrconfig",
- "refinedrust_frontend"
+ "translation"
]
+
+[workspace.dependencies]
+analysis.path = "analysis"
+attribute_parse.path = "attribute_parse"
+radium.path = "radium"
+rr_rustc_interface.path = "rr_rustc_interface"
+rrconfig.path = "rrconfig"
+translation.path = "translation"
diff --git a/rr_frontend/analysis/Cargo.toml b/rr_frontend/analysis/Cargo.toml
index 1d621db9..d75e23c7 100644
--- a/rr_frontend/analysis/Cargo.toml
+++ b/rr_frontend/analysis/Cargo.toml
@@ -5,13 +5,14 @@ authors = ["Federico Poli <federpoli@gmail.com>"]
edition = "2021"
[dependencies]
+rr_rustc_interface.workspace = true
+
log = { version = "0.4", features = ["release_max_level_info"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
env_logger = "0.11"
syn = { version = "2", features = [ "full", "parsing" ] }
derive_more = { version = "1.0.0-beta.6", features = [ "full" ] }
-rr_rustc_interface = { path = "../rr_rustc_interface" }
[dev-dependencies]
compiletest_rs = "0.10"
diff --git a/rr_frontend/radium/Cargo.toml b/rr_frontend/radium/Cargo.toml
index b02b9f15..563988aa 100644
--- a/rr_frontend/radium/Cargo.toml
+++ b/rr_frontend/radium/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
+rrconfig.workspace = true
+
log = "0.4"
-rrconfig = { path = "../rrconfig" }
indent_write = "2"
diff --git a/rr_frontend/refinedrust_frontend/Cargo.toml b/rr_frontend/refinedrust_frontend/Cargo.toml
index 7a1c2614..b815571b 100644
--- a/rr_frontend/refinedrust_frontend/Cargo.toml
+++ b/rr_frontend/refinedrust_frontend/Cargo.toml
@@ -16,14 +16,13 @@ doctest=false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
+rr_rustc_interface.workspace = true
+rrconfig.workspace = true
+translation.workspace = true
+
log = "0.4"
env_logger = "0.11"
fs_extra = "1"
-translation = { path = "../translation" }
-rr_rustc_interface = { path = "../rr_rustc_interface" }
-rrconfig = { path = "../rrconfig" }
-
-
[package.metadata.rust-analyzer]
rustc_private=true
diff --git a/rr_frontend/translation/Cargo.toml b/rr_frontend/translation/Cargo.toml
index 5db4c97f..f754d255 100644
--- a/rr_frontend/translation/Cargo.toml
+++ b/rr_frontend/translation/Cargo.toml
@@ -5,6 +5,12 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
+analysis.workspace = true
+attribute_parse.workspace = true
+radium.workspace = true
+rr_rustc_interface.workspace = true
+rrconfig.workspace = true
+
log = "0.4"
datafrog = "2"
regex = "1"
@@ -16,12 +22,5 @@ serde_json = "1"
serde = {version = "1", features = ["derive"]}
topological-sort = "0.2"
-analysis = { path = "../analysis" }
-radium = { path = "../radium" }
-rr_rustc_interface = { path = "../rr_rustc_interface" }
-attribute_parse = { path = "../attribute_parse" }
-rrconfig = { path = "../rrconfig" }
-
-
[package.metadata.rust-analyzer]
rustc_private=true
--
GitLab