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"

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

Lines changed: 14 additions & 10 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
Archive, CommandError, ExerciseDesc, LanguagePlugin, Output, PopenError, RunResult, RunStatus,
1819
TestDesc, TmcCommand, TmcError, TmcProjectYml,
1920
};
@@ -361,41 +362,44 @@ impl LanguagePlugin for MakePlugin {
361362
fn points_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
362363
fn tmc_register_test_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
363364
sequence::delimited(
364-
sequence::tuple((
365+
(
365366
bytes::complete::tag("tmc_register_test"),
366367
character::complete::multispace0,
367368
character::complete::char('('),
368369
character::complete::multispace0,
369370
arg_parser,
370371
arg_parser,
371-
)),
372+
),
372373
string_parser,
373-
sequence::tuple((
374+
(
374375
character::complete::multispace0,
375376
character::complete::char(')'),
376-
)),
377-
)(i)
377+
),
378+
)
379+
.parse(i)
378380
.map(|(a, b)| (a, vec![b]))
379381
}
380382

381383
// todo: currently cannot handle function calls with multiple parameters, probably not a problem
382384
fn arg_parser(i: &str) -> IResult<&str, &str, VerboseError<&str>> {
383385
combinator::value(
384386
"",
385-
sequence::tuple((
387+
(
386388
bytes::complete::take_till(|c: char| c.is_whitespace() || c == ','),
387389
character::complete::char(','),
388390
character::complete::multispace0,
389-
)),
390-
)(i)
391+
),
392+
)
393+
.parse(i)
391394
}
392395

393396
fn string_parser(i: &str) -> IResult<&str, &str, VerboseError<&str>> {
394397
sequence::delimited(
395398
character::complete::char('"'),
396399
bytes::complete::is_not("\""),
397400
character::complete::char('"'),
398-
)(i)
401+
)
402+
.parse(i)
399403
}
400404

401405
tmc_register_test_parser(i)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ use std::{
99
time::Duration,
1010
};
1111
use tmc_langs_framework::{
12-
nom::{self, error::VerboseError, IResult},
12+
nom::{self, IResult},
13+
nom_language::error::VerboseError,
1314
Archive, ExerciseDesc, LanguagePlugin, RunResult, RunStatus, StudentFilePolicy, TestDesc,
1415
TestResult, TmcError, TmcProjectYml,
1516
};

‎crates/plugins/python3/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ hex = "0.4.3"
1515
hmac = "0.12.0"
1616
log = "0.4.14"
1717
once_cell = "1.9.0"
18-
rand = "0.8.4"
18+
rand = "0.9.1"
1919
serde = "1.0.136"
2020
serde_json = "1.0.78"
2121
sha2 = "0.10.1"

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ use std::{
1717
time::Duration,
1818
};
1919
use tmc_langs_framework::{
20-
nom::{bytes, character, combinator, error::VerboseError, sequence, IResult},
20+
nom::{bytes, character, combinator, sequence, IResult, Parser},
21+
nom_language::error::VerboseError,
2122
Archive, CommandError, ExerciseDesc, LanguagePlugin, Output, PythonVer, RunResult, RunStatus,
2223
TestDesc, TestResult, TmcCommand, TmcError, TmcProjectYml,
2324
};
@@ -267,8 +268,8 @@ impl LanguagePlugin for Python3Plugin {
267268

268269
let (output, random_string) = if exercise_directory.join("tmc/hmac_writer.py").exists() {
269270
// has hmac writer
270-
let random_string: String = rand::thread_rng()
271-
.sample_iter(rand::distributions::Alphanumeric)
271+
let random_string: String = rand::rng()
272+
.sample_iter(rand::distr::Alphanumeric)
272273
.take(32)
273274
.map(char::from)
274275
.collect();
@@ -497,19 +498,19 @@ impl LanguagePlugin for Python3Plugin {
497498
fn points_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
498499
combinator::map(
499500
sequence::delimited(
500-
sequence::tuple((
501+
(
501502
character::complete::char('@'),
502503
character::complete::multispace0,
503504
bytes::complete::tag_no_case("points"),
504505
character::complete::multispace0,
505506
character::complete::char('('),
506507
character::complete::multispace0,
507-
)),
508+
),
508509
parse_util::comma_separated_strings_either,
509-
sequence::tuple((
510+
(
510511
character::complete::multispace0,
511512
character::complete::char(')'),
512-
)),
513+
),
513514
),
514515
// splits each point by whitespace
515516
|points| {
@@ -518,7 +519,8 @@ impl LanguagePlugin for Python3Plugin {
518519
.flat_map(|p| p.split_whitespace())
519520
.collect()
520521
},
521-
)(i)
522+
)
523+
.parse(i)
522524
}
523525
}
524526

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ use std::{
1010
time::Duration,
1111
};
1212
use tmc_langs_framework::{
13-
nom::{branch, bytes, character, error::VerboseError, sequence, IResult},
13+
nom::{branch, bytes, character, sequence, IResult, Parser},
14+
nom_language::error::VerboseError,
1415
Archive, ExerciseDesc, LanguagePlugin, RunResult, TestDesc, TmcCommand, TmcError,
1516
};
1617
use tmc_langs_util::{deserialize, file_util, parse_util, path_util};
@@ -167,7 +168,7 @@ impl LanguagePlugin for RPlugin {
167168

168169
fn points_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
169170
let test_parser = sequence::preceded(
170-
sequence::tuple((
171+
(
171172
bytes::complete::tag("test"),
172173
character::complete::multispace0,
173174
character::complete::char('('),
@@ -176,36 +177,37 @@ impl LanguagePlugin for RPlugin {
176177
character::complete::multispace0,
177178
character::complete::char(','),
178179
character::complete::multispace0,
179-
)),
180+
),
180181
list_parser,
181182
);
182183
let points_for_all_tests_parser = sequence::preceded(
183-
sequence::tuple((
184+
(
184185
bytes::complete::tag("points_for_all_tests"),
185186
character::complete::multispace0,
186187
character::complete::char('('),
187188
character::complete::multispace0,
188-
)),
189+
),
189190
list_parser,
190191
);
191192

192193
fn list_parser(i: &str) -> IResult<&str, Vec<&str>, VerboseError<&str>> {
193194
sequence::delimited(
194-
sequence::tuple((
195+
(
195196
character::complete::char('c'),
196197
character::complete::multispace0,
197198
character::complete::char('('),
198199
character::complete::multispace0,
199-
)),
200+
),
200201
parse_util::comma_separated_strings,
201-
sequence::tuple((
202+
(
202203
character::complete::multispace0,
203204
character::complete::char(')'),
204-
)),
205-
)(i)
205+
),
206+
)
207+
.parse(i)
206208
}
207209

208-
branch::alt((test_parser, points_for_all_tests_parser))(i)
210+
branch::alt((test_parser, points_for_all_tests_parser)).parse(i)
209211
}
210212
}
211213

‎crates/tmc-langs-cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ts-rs = { workspace = true, features = ["serde-compat"], optional = true }
1616
anyhow = { version = "1.0.53", features = ["backtrace"] }
1717
base64 = "0.22.0"
1818
clap = { version = "4.0.7", features = ["derive"] }
19-
dirs = "5.0.1"
19+
dirs = "6.0.0"
2020
env_logger = "0.11.2"
2121
log = "0.4.14"
2222
rpassword = "7.0.0"

‎crates/tmc-langs-cli/tests/snapshots/integration__compress_project_zstd@make__valgrind-failing-exercise.snap

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ message: compressed project from [PATH] to [PATH]
99
result: executed-command
1010
data:
1111
output-data-kind: compressed-project-hash
12-
output-data: 358a317c6cbafb23164ae75b7e4573dfcd3ed6bcdcf9370937896c44cc34eaf9
13-
12+
output-data: edb45ae505fcb1cedb0371d482762b0fe6d9c838890d7e236dd869de99ca92ff

0 commit comments

Comments
 (0)