Skip to content

Commit 7ecb3ec

Browse files
committed
Use taplo fmt
1 parent 136ce62 commit 7ecb3ec

File tree

12 files changed

+192
-210
lines changed

12 files changed

+192
-210
lines changed

Cargo.lock

Lines changed: 126 additions & 171 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
[workspace]
22
members = [
3-
# core libraries
4-
"crates/tmc-*",
3+
# core libraries
4+
"crates/tmc-*",
55

6-
# language plugins
7-
"crates/plugins/*",
6+
# language plugins
7+
"crates/plugins/*",
88

9-
# bindings to other languages
10-
"crates/bindings/*",
9+
# bindings to other languages
10+
"crates/bindings/*",
1111

12-
# test helpers
13-
"crates/helpers/*",
12+
# test helpers
13+
"crates/helpers/*",
1414
]
1515
resolver = "2"
1616

1717
[workspace.package]
18-
version = "0.33.0"
1918
authors = [
20-
"University of Helsinki <[email protected]>",
21-
"Daniel Martinez <[email protected]>",
19+
"University of Helsinki <[email protected]>",
20+
"Daniel Martinez <[email protected]>",
2221
]
2322
edition = "2021"
24-
rust-version = "1.70.0"
2523
license = "MIT OR Apache-2.0"
24+
rust-version = "1.70.0"
25+
version = "0.33.0"
2626

2727
[workspace.dependencies]
28-
tmc-testmycode-client = { path = "crates/tmc-testmycode-client" }
29-
tmc-mooc-client = { path = "crates/tmc-mooc-client" }
28+
mooc-langs-api = { git = "https://github.com/rage/secret-project-331.git", rev = "df8bd2b0c12ba8652e0e46b7ccba25dea1547dc6" }
3029
tmc-langs = { path = "crates/tmc-langs" }
31-
tmc-langs-framework = { path = "crates/tmc-langs-framework" }
32-
tmc-langs-plugins = { path = "crates/tmc-langs-plugins" }
33-
tmc-langs-util = { path = "crates/tmc-langs-util" }
3430
tmc-langs-csharp = { path = "crates/plugins/csharp" }
31+
tmc-langs-framework = { path = "crates/tmc-langs-framework" }
3532
tmc-langs-java = { path = "crates/plugins/java" }
3633
tmc-langs-make = { path = "crates/plugins/make" }
3734
tmc-langs-notests = { path = "crates/plugins/notests" }
35+
tmc-langs-plugins = { path = "crates/tmc-langs-plugins" }
3836
tmc-langs-python3 = { path = "crates/plugins/python3" }
3937
tmc-langs-r = { path = "crates/plugins/r" }
38+
tmc-langs-util = { path = "crates/tmc-langs-util" }
39+
tmc-mooc-client = { path = "crates/tmc-mooc-client" }
4040
tmc-server-mock = { path = "crates/helpers/tmc-server-mock" }
41-
ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "07712bf04007472aeeb065091261b3b64c019381" }
42-
mooc-langs-api = { git = "https://github.com/rage/secret-project-331.git", rev = "df8bd2b0c12ba8652e0e46b7ccba25dea1547dc6" }
41+
tmc-testmycode-client = { path = "crates/tmc-testmycode-client" }
42+
ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "d6cad971aca4aac40462279cbf96cc3bb3b7f30c" }
4343

4444
# [patch.'https://github.com/Heliozoa/ts-rs.git']
4545
# ts-rs = { path = "../ts-rs/ts-rs" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ exclude = ["index.node"]
1212
crate-type = ["cdylib"]
1313

1414
[dependencies.neon]
15-
version = "0.10.0"
1615
default-features = false
1716
features = ["napi-6", "default-panic-hook"]
17+
version = "0.10.0"
1818

1919
[dependencies]
2020
tmc-langs = { workspace = true, features = ["ts-rs"] }

crates/helpers/tmc-server-mock/Cargo.toml

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

99
[dependencies]
10-
serde_json = "1.0.78"
1110
mockito = "1.0.2"
11+
serde_json = "1.0.78"

crates/plugins/make/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ log = "0.4.14"
1414
once_cell = "1.9.0"
1515
regex = "1.5.4"
1616
serde = { version = "1.0.136", features = ["derive"] }
17-
serde_yaml = "0.9.10"
1817
serde-xml-rs = "0.6.0"
18+
serde_yaml = "0.9.10"
1919
thiserror = "1.0.30"
2020
zip = "0.6.3"
2121

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.workspace = true
1312
tmc-langs-util.workspace = true
13+
tmc-langs.workspace = true
1414
ts-rs = { workspace = true, features = ["serde-compat"], optional = true }
1515

1616
anyhow = { version = "1.0.53", features = ["backtrace"] }
@@ -27,8 +27,8 @@ tempfile = "3.3.0"
2727
thiserror = "1.0.30"
2828
toml = "0.7.2"
2929
url = "2.2.2"
30-
walkdir = "2.3.2"
3130
uuid = { version = "1.3.4", features = ["v4"] }
31+
walkdir = "2.3.2"
3232

3333
[dev-dependencies]
3434
insta = { version = "1.28.0", features = ["yaml", "glob", "filters"] }

crates/tmc-langs-framework/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ log = "0.4.14"
1616
nom = { version = "7.1.0", features = ["alloc"] }
1717
once_cell = "1.9.0"
1818
regex = "1.5.4"
19+
schemars = "0.8.8"
1920
serde = { version = "1.0.136", features = ["derive"] }
2021
serde_yaml = "0.9.10"
21-
schemars = "0.8.8"
2222
subprocess = "0.2.8"
2323
tar = "0.4.38"
2424
tempfile = "3.3.0"

crates/tmc-langs/Cargo.toml

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

99
[dependencies]
10-
tmc-testmycode-client.workspace = true
11-
tmc-mooc-client.workspace = true
12-
tmc-langs-plugins.workspace = true
1310
tmc-langs-framework.workspace = true
11+
tmc-langs-plugins.workspace = true
1412
tmc-langs-util.workspace = true
15-
ts-rs = { workspace = true, features = ["serde-compat", "toml-impl"], optional = true }
13+
tmc-mooc-client.workspace = true
14+
tmc-testmycode-client.workspace = true
15+
ts-rs = { workspace = true, features = [
16+
"serde-compat",
17+
"toml-impl",
18+
], optional = true }
1619

1720
base64 = "0.21.0"
21+
blake3 = "1.4.0"
1822
chrono = { version = "0.4.26", features = ["serde"] }
1923
dirs = "5.0.1"
2024
hmac = { version = "0.12.0", features = ["std"] }
@@ -40,7 +44,6 @@ uuid = { version = "1.3.4", features = ["v4"] }
4044
walkdir = "2.3.2"
4145
zip = "0.6.3"
4246
zstd = "0.12.3"
43-
blake3 = "1.4.0"
4447

4548
[target.'cfg(unix)'.dependencies]
4649
nix = "0.26.2"
@@ -52,4 +55,9 @@ simple_logger = "4.0.0"
5255
tempfile = "3.3.0"
5356

5457
[features]
55-
ts-rs = ["dep:ts-rs", "tmc-testmycode-client/ts-rs", "tmc-langs-framework/ts-rs", "tmc-langs-util/ts-rs"]
58+
ts-rs = [
59+
"dep:ts-rs",
60+
"tmc-testmycode-client/ts-rs",
61+
"tmc-langs-framework/ts-rs",
62+
"tmc-langs-util/ts-rs",
63+
]

crates/tmc-mooc-client/Cargo.toml

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

99
[dependencies]
10-
tmc-langs-util.workspace = true
1110
mooc-langs-api.workspace = true
11+
tmc-langs-util.workspace = true
1212

1313
bytes = "1.4.0"
1414
chrono = "0.4.26"
1515
log = "0.4.18"
1616
oauth2 = "4.4.1"
17-
reqwest = { version = "0.11.18", default-features = false, features = ["blocking", "json", "rustls-tls", "multipart", "cookies"] }
17+
reqwest = { version = "0.11.18", default-features = false, features = [
18+
"blocking",
19+
"json",
20+
"rustls-tls",
21+
"multipart",
22+
"cookies",
23+
] }
1824
serde = { version = "1.0.163", features = ["derive"] }
1925
serde_json = "1.0.96"
2026
thiserror = "1.0.40"

crates/tmc-testmycode-client/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ once_cell = "1.9.0"
2020
percent-encoding = "2.1.0"
2121
regex = "1.5.4"
2222
reqwest = { version = "0.11.9", default-features = false, features = [
23-
"blocking",
24-
"json",
25-
"rustls-tls",
26-
"multipart",
27-
]}
23+
"blocking",
24+
"json",
25+
"rustls-tls",
26+
"multipart",
27+
] }
2828
schemars = { version = "0.8.8", features = ["chrono"] }
2929
serde = { version = "1.0.136", features = ["derive"] }
3030
serde_json = "1.0.78"

0 commit comments

Comments
 (0)