Skip to content

Commit 3dab20c

Browse files
committed
Put crates in crates
1 parent 54fa636 commit 3dab20c

File tree

356 files changed

+49
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

356 files changed

+49
-45
lines changed

Cargo.toml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
11
[workspace]
22
members = [
33
# core libraries
4-
"tmc-client",
5-
"tmc-langs",
6-
"tmc-langs-cli",
7-
"tmc-langs-framework",
8-
"tmc-langs-plugins",
9-
"tmc-langs-util",
4+
"crates/tmc-*",
105

116
# language plugins
12-
"plugins/csharp",
13-
"plugins/java",
14-
"plugins/make",
15-
"plugins/notests",
16-
"plugins/python3",
17-
"plugins/r",
7+
"crates/plugins/*",
188

199
# bindings to other languages
20-
"bindings/tmc-langs-node",
10+
"crates/bindings/*",
2111

2212
# test helpers
23-
"tmc-server-mock",
13+
"crates/helpers/*",
2414
]
2515
resolver = "2"
2616

@@ -32,3 +22,17 @@ authors = [
3222
edition = "2021"
3323
rust-version = "1.58.1"
3424
license = "MIT OR Apache-2.0"
25+
26+
[workspace.dependencies]
27+
tmc-client = { path = "crates/tmc-client" }
28+
tmc-langs = { path = "crates/tmc-langs" }
29+
tmc-langs-framework = { path = "crates/tmc-langs-framework" }
30+
tmc-langs-plugins = { path = "crates/tmc-langs-plugins" }
31+
tmc-langs-util = { path = "crates/tmc-langs-util" }
32+
tmc-langs-csharp = { path = "crates/plugins/csharp" }
33+
tmc-langs-java = { path = "crates/plugins/java" }
34+
tmc-langs-make = { path = "crates/plugins/make" }
35+
tmc-langs-notests = { path = "crates/plugins/notests" }
36+
tmc-langs-python3 = { path = "crates/plugins/python3" }
37+
tmc-langs-r = { path = "crates/plugins/r" }
38+
tmc-server-mock = { path = "crates/helpers/tmc-server-mock" }

bindings/tmc-langs-node/Cargo.toml renamed to crates/bindings/tmc-langs-node/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ default-features = false
1717
features = ["napi-6", "default-panic-hook"]
1818

1919
[dependencies]
20-
tmc-langs = { path = "../../tmc-langs", features = ["ts"] }
20+
tmc-langs = { workspace = true, features = ["ts"] }
2121

2222
base64 = "0.13.0"
2323
env_logger = "0.9.0"
@@ -32,4 +32,4 @@ ts-rs = { git = "https://github.com/Heliozoa/ts-rs/", features = [
3232
log = "0.4.14"
3333
once_cell = "1.9.0"
3434
simple_logger = "2.1.0"
35-
tmc-server-mock = { path = "../../tmc-server-mock" }
35+
tmc-server-mock .workspace = true

plugins/csharp/Cargo.toml renamed to crates/plugins/csharp/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-framework = { path = "../../tmc-langs-framework" }
11-
tmc-langs-util = { path = "../../tmc-langs-util" }
10+
tmc-langs-framework .workspace = true
11+
tmc-langs-util .workspace = true
1212

1313
dirs = "4.0.0"
1414
log = "0.4.14"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

plugins/java/Cargo.toml renamed to crates/plugins/java/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-framework = { path = "../../tmc-langs-framework" }
11-
tmc-langs-util = { path = "../../tmc-langs-util" }
10+
tmc-langs-framework .workspace = true
11+
tmc-langs-util .workspace = true
1212

1313
dirs = "4.0.0"
1414
flate2 = "1.0.22"
File renamed without changes.
File renamed without changes.

plugins/make/Cargo.toml renamed to crates/plugins/make/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-framework = { path = "../../tmc-langs-framework" }
11-
tmc-langs-util = { path = "../../tmc-langs-util" }
10+
tmc-langs-framework.workspace = true
11+
tmc-langs-util.workspace = true
1212

1313
log = "0.4.14"
1414
once_cell = "1.9.0"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

plugins/notests/Cargo.toml renamed to crates/plugins/notests/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-framework = { path = "../../tmc-langs-framework" }
11-
tmc-langs-util = { path = "../../tmc-langs-util" }
10+
tmc-langs-framework.workspace = true
11+
tmc-langs-util.workspace = true
1212

1313
log = "0.4.14"
1414
zip = { git = "https://github.com/zip-rs/zip.git", rev = "bb230ef56adc13436d1fcdfaa489249d119c498f" } # use from git until zip releases a version with zstd 0.11
File renamed without changes.
File renamed without changes.
File renamed without changes.

plugins/python3/Cargo.toml renamed to crates/plugins/python3/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-framework = { path = "../../tmc-langs-framework" }
11-
tmc-langs-util = { path = "../../tmc-langs-util" }
10+
tmc-langs-framework.workspace = true
11+
tmc-langs-util.workspace = true
1212

1313
dunce = "1.0.2"
1414
hex = "0.4.3"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

plugins/r/Cargo.toml renamed to crates/plugins/r/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-framework = { path = "../../tmc-langs-framework" }
11-
tmc-langs-util = { path = "../../tmc-langs-util" }
10+
tmc-langs-framework.workspace = true
11+
tmc-langs-util.workspace = true
1212

1313
log = "0.4.14"
1414
serde = { version = "1.0.136", features = ["derive"] }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tmc-client/Cargo.toml renamed to crates/tmc-client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-plugins = { path = "../tmc-langs-plugins" }
11-
tmc-langs-util = { path = "../tmc-langs-util" }
10+
tmc-langs-plugins.workspace = true
11+
tmc-langs-util.workspace = true
1212

1313
chrono = { version = "0.4.19", features = ["serde"] }
1414
dirs = "4.0.0"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tmc-langs-cli/Cargo.toml renamed to crates/tmc-langs-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ rust-version.workspace = true
99
default-run = "tmc-langs-cli"
1010

1111
[dependencies]
12-
tmc-langs = { path = "../tmc-langs" }
13-
tmc-langs-util = { path = "../tmc-langs-util" }
12+
tmc-langs.workspace = true
13+
tmc-langs-util.workspace = true
1414

1515
anyhow = "1.0.53"
1616
base64 = "0.13.0"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tmc-langs-framework/Cargo.toml renamed to crates/tmc-langs-framework/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-util = { path = "../tmc-langs-util" }
10+
tmc-langs-util.workspace = true
1111

1212
fd-lock = "3.0.3"
1313
isolang = "2.1.0"

tmc-langs-plugins/Cargo.toml renamed to crates/tmc-langs-plugins/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-langs-framework = { path = "../tmc-langs-framework" }
11-
tmc-langs-util = { path = "../tmc-langs-util" }
10+
tmc-langs-framework.workspace = true
11+
tmc-langs-util.workspace = true
1212

13-
tmc-langs-csharp = { path = "../plugins/csharp" }
14-
tmc-langs-java = { path = "../plugins/java" }
15-
tmc-langs-make = { path = "../plugins/make" }
16-
tmc-langs-notests = { path = "../plugins/notests" }
17-
tmc-langs-python3 = { path = "../plugins/python3" }
18-
tmc-langs-r = { path = "../plugins/r" }
13+
tmc-langs-csharp.workspace = true
14+
tmc-langs-java.workspace = true
15+
tmc-langs-make.workspace = true
16+
tmc-langs-notests.workspace = true
17+
tmc-langs-python3.workspace = true
18+
tmc-langs-r.workspace = true
1919

2020
impl-enum = "0.3.0"
2121
log = "0.4.14"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tmc-langs/Cargo.toml renamed to crates/tmc-langs/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
tmc-client = { path = "../tmc-client" }
11-
tmc-langs-plugins = { path = "../tmc-langs-plugins" }
12-
tmc-langs-framework = { path = "../tmc-langs-framework" }
13-
tmc-langs-util = { path = "../tmc-langs-util" }
10+
tmc-client.workspace = true
11+
tmc-langs-plugins.workspace = true
12+
tmc-langs-framework.workspace = true
13+
tmc-langs-util.workspace = true
1414

1515
base64 = "0.13.0"
1616
dirs = "4.0.0"
File renamed without changes.

0 commit comments

Comments
 (0)