Skip to content

Commit 36f7fc8

Browse files
committed
Merge branch 'master' of github.com:rage/tmc-langs-rust
2 parents 8d8bb2c + 0bf9ad1 commit 36f7fc8

File tree

33 files changed

+679
-680
lines changed

33 files changed

+679
-680
lines changed

tmc-langs-abstraction/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub enum Strategy {
1212
Disabled,
1313
}
1414

15-
#[derive(Debug, Deserialize, Serialize)]
15+
#[derive(Debug, Deserialize, Serialize, PartialEq, Eq)]
1616
#[serde(rename_all = "camelCase")]
1717
pub struct ValidationError {
1818
pub column: usize,
@@ -21,7 +21,7 @@ pub struct ValidationError {
2121
pub source_name: String,
2222
}
2323

24-
#[derive(Debug, Deserialize, Serialize)]
24+
#[derive(Debug, Deserialize, Serialize, PartialEq, Eq)]
2525
#[serde(rename_all = "camelCase")]
2626
pub struct ValidationResult {
2727
pub strategy: Strategy,

tmc-langs-cli/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ walkdir = "2"
1414
serde_json = "1"
1515
env_logger = "0.7"
1616
log = "0.4"
17-
thiserror = "1"
1817
rpassword = { git = "https://github.com/conradkleinespel/rpassword", rev = "189c388" } # fixes a windows test issue, use until version 5 is released
1918
url = "2"
2019
serde = "1"
20+
anyhow = "1"
21+
ansi_term = "0.12"
22+
quit = "1"
2123

2224
[dev-dependencies]
2325
tempfile = "3"
24-
mockito = "0.25"
26+
mockito = "0.26"
2527
dotenv = "0.15"

0 commit comments

Comments
 (0)