Skip to content

Commit bf47ec9

Browse files
HeliozoaHeliozoa
committed
Updated deps
1 parent 9b1e3b2 commit bf47ec9

File tree

33 files changed

+989
-725
lines changed

33 files changed

+989
-725
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ rust-version = "1.70.0"
2525
version = "0.37.2"
2626

2727
[workspace.dependencies]
28-
mooc-langs-api = { git = "https://github.com/rage/secret-project-331.git", rev = "9fb5f894c72932e77dafa6d0f00df7a8abdfa84c" }
28+
mooc-langs-api = { git = "https://github.com/rage/secret-project-331.git", rev = "64d45c936a77f81af69c4077e9249b5e7245f66f" }
2929
tmc-langs = { path = "crates/tmc-langs" }
3030
tmc-langs-csharp = { path = "crates/plugins/csharp" }
3131
tmc-langs-framework = { path = "crates/tmc-langs-framework" }

‎crates/plugins/csharp/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ rust-version.workspace = true
1010
tmc-langs-framework.workspace = true
1111
tmc-langs-util.workspace = true
1212

13-
dirs = "5.0.1"
13+
dirs = "6.0.0"
1414
log = "0.4.14"
1515
serde = { version = "1.0.136", features = ["derive"] }
1616
serde_json = "1.0.78"

‎crates/plugins/csharp/src/plugin.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ use std::{
1111
time::Duration,
1212
};
1313
use tmc_langs_framework::{
14-
nom::{bytes, character, combinator, error::VerboseError, sequence, IResult},
14+
nom::{bytes, character, combinator, sequence, IResult, Parser},
15+
nom_language::error::VerboseError,
1516
Archive, CommandError, ExerciseDesc, Language, LanguagePlugin, RunResult, RunStatus,
1617
StyleValidationResult, StyleValidationStrategy, TestDesc, TestResult, TmcCommand, TmcError,
1718
};
@@ -355,21 +356,21 @@ impl LanguagePlugin for CSharpPlugin {
355356
fn points_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
356357
combinator::map(
357358
sequence::delimited(
358-
sequence::tuple((
359+
(
359360
character::complete::char('['),
360361
character::complete::multispace0,
361362
bytes::complete::tag_no_case("points"),
362363
character::complete::multispace0,
363364
character::complete::char('('),
364365
character::complete::multispace0,
365-
)),
366+
),
366367
parse_util::comma_separated_strings,
367-
sequence::tuple((
368+
(
368369
character::complete::multispace0,
369370
character::complete::char(')'),
370371
character::complete::multispace0,
371372
character::complete::char(']'),
372-
)),
373+
),
373374
),
374375
// splits each point by whitespace
375376
|points| {
@@ -378,7 +379,8 @@ impl LanguagePlugin for CSharpPlugin {
378379
.flat_map(|p| p.split_whitespace())
379380
.collect()
380381
},
381-
)(i)
382+
)
383+
.parse(i)
382384
}
383385
}
384386

‎crates/plugins/java/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ rust-version.workspace = true
1010
tmc-langs-framework.workspace = true
1111
tmc-langs-util.workspace = true
1212

13-
dirs = "5.0.1"
13+
dirs = "6.0.0"
1414
flate2 = "1.0.22"
15-
j4rs = "=0.21.0" # specific version to match the jar
15+
j4rs = "=0.22.0" # specific version to match the jar
1616
log = "0.4.14"
1717
once_cell = "1.9.0"
1818
serde = { version = "1.0.136", features = ["derive"] }

‎crates/plugins/java/src/ant_plugin.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ use std::{
1313
time::Duration,
1414
};
1515
use tmc_langs_framework::{
16-
nom::{error::VerboseError, IResult},
17-
Archive, ExerciseDesc, Language, LanguagePlugin, RunResult, StyleValidationResult, TmcCommand,
18-
TmcError,
16+
nom::IResult, nom_language::error::VerboseError, Archive, ExerciseDesc, Language,
17+
LanguagePlugin, RunResult, StyleValidationResult, TmcCommand, TmcError,
1918
};
2019
use tmc_langs_util::{file_util, path_util};
2120
use walkdir::WalkDir;

‎crates/plugins/java/src/java_plugin.rs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ use std::{
1313
time::Duration,
1414
};
1515
use tmc_langs_framework::{
16-
nom::{bytes, character, combinator, error::VerboseError, sequence, IResult},
16+
nom::{bytes, character, combinator, sequence, IResult, Parser},
17+
nom_language::error::VerboseError,
1718
ExerciseDesc, Language, LanguagePlugin, RunResult, RunStatus, StyleValidationError,
1819
StyleValidationResult, StyleValidationStrategy, TestDesc, TestResult, TmcCommand,
1920
};
@@ -267,19 +268,19 @@ pub(crate) trait JavaPlugin: LanguagePlugin {
267268
fn java_points_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
268269
combinator::map(
269270
sequence::delimited(
270-
sequence::tuple((
271+
(
271272
character::complete::char('@'),
272273
character::complete::multispace0,
273274
bytes::complete::tag_no_case("points"),
274275
character::complete::multispace0,
275276
character::complete::char('('),
276277
character::complete::multispace0,
277-
)),
278+
),
278279
parse_util::comma_separated_strings,
279-
sequence::tuple((
280+
(
280281
character::complete::multispace0,
281282
character::complete::char(')'),
282-
)),
283+
),
283284
),
284285
// splits each point by whitespace
285286
|points| {
@@ -288,7 +289,8 @@ pub(crate) trait JavaPlugin: LanguagePlugin {
288289
.flat_map(|p| p.split_whitespace())
289290
.collect()
290291
},
291-
)(i)
292+
)
293+
.parse(i)
292294
}
293295
}
294296

@@ -359,7 +361,7 @@ mod test {
359361
use super::*;
360362
use crate::SEPARATOR;
361363
use std::io::{Read, Seek};
362-
use tmc_langs_framework::{nom, Archive, TmcError};
364+
use tmc_langs_framework::{Archive, TmcError};
363365

364366
fn init() {
365367
use log::*;
@@ -442,7 +444,7 @@ mod test {
442444
unimplemented!()
443445
}
444446

445-
fn points_parser(i: &str) -> IResult<&str, Vec<&str>, nom::error::VerboseError<&str>> {
447+
fn points_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
446448
Self::java_points_parser(i)
447449
}
448450
}

‎crates/plugins/java/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const SEPARATOR: &str = ":";
3232
const TMC_JUNIT_RUNNER_BYTES: &[u8] = include_bytes!("../deps/tmc-junit-runner-0.2.8.jar");
3333
const TMC_CHECKSTYLE_RUNNER_BYTES: &[u8] =
3434
include_bytes!("../deps/tmc-checkstyle-runner-3.0.3-20200520.064542-3.jar");
35-
const J4RS_BYTES: &[u8] = include_bytes!("../deps/j4rs-0.21.0-jar-with-dependencies.jar");
35+
const J4RS_BYTES: &[u8] = include_bytes!("../deps/j4rs-0.22.0-jar-with-dependencies.jar");
3636

3737
struct JvmWrapper {
3838
jvm: Jvm,

‎crates/plugins/java/src/maven_plugin.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ use std::{
1414
};
1515
use tar::Archive as Tar;
1616
use tmc_langs_framework::{
17-
nom::{error::VerboseError, IResult},
18-
Archive, ExerciseDesc, Language, LanguagePlugin, RunResult, StyleValidationResult, TmcCommand,
19-
TmcError,
17+
nom::IResult, nom_language::error::VerboseError, Archive, ExerciseDesc, Language,
18+
LanguagePlugin, RunResult, StyleValidationResult, TmcCommand, TmcError,
2019
};
2120
use tmc_langs_util::{file_util, path_util};
2221

‎crates/plugins/make/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log = "0.4.14"
1414
once_cell = "1.9.0"
1515
regex = "1.10.6"
1616
serde = { version = "1.0.136", features = ["derive"] }
17-
serde-xml-rs = "0.6.0"
17+
serde-xml-rs = "0.7.0"
1818
serde_yaml = "0.9.10"
1919
thiserror = "2.0.3"
2020
zip = "2.2.0"

0 commit comments

Comments
 (0)