Skip to content

Commit d0006e8

Browse files
HeliozoaHeliozoa
committed
fix imports
1 parent ece804d commit d0006e8

File tree

10 files changed

+115
-138
lines changed

10 files changed

+115
-138
lines changed

‎plugins/csharp/src/plugin.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use tmc_langs_framework::{
1717
},
1818
error::FileIo,
1919
io::file_util,
20-
nom::{self, IResult},
20+
nom::{bytes, character, combinator, sequence, IResult},
2121
plugin::Language,
2222
zip::ZipArchive,
2323
LanguagePlugin, TmcError,
@@ -280,24 +280,24 @@ impl LanguagePlugin for CSharpPlugin {
280280
}
281281

282282
fn points_parser<'a>(i: &'a str) -> IResult<&'a str, &'a str> {
283-
nom::combinator::map(
284-
nom::sequence::delimited(
285-
nom::sequence::tuple((
286-
nom::bytes::complete::tag("@"),
287-
nom::character::complete::multispace0,
288-
nom::bytes::complete::tag_no_case("points"),
289-
nom::character::complete::multispace0,
290-
nom::character::complete::char('('),
291-
nom::character::complete::multispace0,
283+
combinator::map(
284+
sequence::delimited(
285+
sequence::tuple((
286+
bytes::complete::tag("@"),
287+
character::complete::multispace0,
288+
bytes::complete::tag_no_case("points"),
289+
character::complete::multispace0,
290+
character::complete::char('('),
291+
character::complete::multispace0,
292292
)),
293-
nom::sequence::delimited(
294-
nom::character::complete::char('"'),
295-
nom::bytes::complete::is_not("\""),
296-
nom::character::complete::char('"'),
293+
sequence::delimited(
294+
character::complete::char('"'),
295+
bytes::complete::is_not("\""),
296+
character::complete::char('"'),
297297
),
298-
nom::sequence::tuple((
299-
nom::character::complete::multispace0,
300-
nom::character::complete::char(')'),
298+
sequence::tuple((
299+
character::complete::multispace0,
300+
character::complete::char(')'),
301301
)),
302302
),
303303
str::trim,

‎plugins/java/src/ant.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use tmc_langs_framework::{
1414
command::TmcCommand,
1515
domain::{ExerciseDesc, RunResult, ValidationResult},
1616
io::file_util,
17-
nom::{self, IResult},
17+
nom::IResult,
1818
plugin::{Language, LanguagePlugin},
1919
TmcError,
2020
};

‎plugins/java/src/maven.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use tmc_langs_framework::{
1616
command::TmcCommand,
1717
domain::{ExerciseDesc, RunResult, ValidationResult},
1818
io::file_util,
19-
nom::{self, IResult},
19+
nom::IResult,
2020
plugin::{Language, LanguagePlugin},
2121
TmcError,
2222
};

‎plugins/java/src/plugin.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use tmc_langs_framework::{
1010
command::TmcCommand,
1111
domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult, ValidationResult},
1212
io::file_util,
13-
nom::{self, IResult},
13+
nom::{bytes, character, combinator, sequence, IResult},
1414
plugin::{Language, LanguagePlugin},
1515
};
1616
use walkdir::WalkDir;
@@ -247,24 +247,24 @@ pub(crate) trait JavaPlugin: LanguagePlugin {
247247
}
248248

249249
fn java_points_parser<'a>(i: &'a str) -> IResult<&'a str, &'a str> {
250-
nom::combinator::map(
251-
nom::sequence::delimited(
252-
nom::sequence::tuple((
253-
nom::bytes::complete::tag("@"),
254-
nom::character::complete::multispace0,
255-
nom::bytes::complete::tag_no_case("points"),
256-
nom::character::complete::multispace0,
257-
nom::character::complete::char('('),
258-
nom::character::complete::multispace0,
250+
combinator::map(
251+
sequence::delimited(
252+
sequence::tuple((
253+
bytes::complete::tag("@"),
254+
character::complete::multispace0,
255+
bytes::complete::tag_no_case("points"),
256+
character::complete::multispace0,
257+
character::complete::char('('),
258+
character::complete::multispace0,
259259
)),
260-
nom::sequence::delimited(
261-
nom::character::complete::char('"'),
262-
nom::bytes::complete::is_not("\""),
263-
nom::character::complete::char('"'),
260+
sequence::delimited(
261+
character::complete::char('"'),
262+
bytes::complete::is_not("\""),
263+
character::complete::char('"'),
264264
),
265-
nom::sequence::tuple((
266-
nom::character::complete::multispace0,
267-
nom::character::complete::char(')'),
265+
sequence::tuple((
266+
character::complete::multispace0,
267+
character::complete::char(')'),
268268
)),
269269
),
270270
str::trim,

‎plugins/make/src/plugin.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use tmc_langs_framework::{
1616
domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TmcProjectYml},
1717
error::{CommandError, FileIo},
1818
io::file_util,
19-
nom::{self, IResult},
19+
nom::{bytes, character, combinator, sequence, IResult},
2020
plugin::LanguagePlugin,
2121
TmcError,
2222
};
@@ -312,22 +312,22 @@ impl LanguagePlugin for MakePlugin {
312312
}
313313

314314
fn points_parser<'a>(i: &'a str) -> IResult<&'a str, &'a str> {
315-
nom::combinator::map(
316-
nom::sequence::delimited(
317-
nom::sequence::tuple((
318-
nom::bytes::complete::tag("tmc_register_test"),
319-
nom::character::complete::multispace0,
320-
nom::character::complete::char('('),
321-
nom::bytes::complete::is_not("\""),
315+
combinator::map(
316+
sequence::delimited(
317+
sequence::tuple((
318+
bytes::complete::tag("tmc_register_test"),
319+
character::complete::multispace0,
320+
character::complete::char('('),
321+
bytes::complete::is_not("\""),
322322
)),
323-
nom::sequence::delimited(
324-
nom::character::complete::char('"'),
325-
nom::bytes::complete::is_not("\""),
326-
nom::character::complete::char('"'),
323+
sequence::delimited(
324+
character::complete::char('"'),
325+
bytes::complete::is_not("\""),
326+
character::complete::char('"'),
327327
),
328-
nom::sequence::tuple((
329-
nom::character::complete::multispace0,
330-
nom::character::complete::char(')'),
328+
sequence::tuple((
329+
character::complete::multispace0,
330+
character::complete::char(')'),
331331
)),
332332
),
333333
str::trim,

‎plugins/notests/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::time::Duration;
77
pub use tmc_langs_framework::policy::EverythingIsStudentFilePolicy as NoTestsStudentFilePolicy;
88
use tmc_langs_framework::{
99
domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},
10-
nom::{self, IResult},
10+
nom::IResult,
1111
zip::ZipArchive,
1212
LanguagePlugin, StudentFilePolicy, TmcError,
1313
};

‎plugins/python3/src/plugin.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use tmc_langs_framework::{
1111
command::{OutputWithTimeout, TmcCommand},
1212
domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},
1313
io::file_util,
14-
nom::{self, IResult},
14+
nom::{branch, bytes, character, combinator, sequence, IResult},
1515
plugin::LanguagePlugin,
1616
TmcError,
1717
};
@@ -143,31 +143,31 @@ impl LanguagePlugin for Python3Plugin {
143143
}
144144

145145
fn points_parser<'a>(i: &'a str) -> IResult<&'a str, &'a str> {
146-
nom::combinator::map(
147-
nom::sequence::delimited(
148-
nom::sequence::tuple((
149-
nom::bytes::complete::tag("@"),
150-
nom::character::complete::multispace0,
151-
nom::bytes::complete::tag_no_case("points"),
152-
nom::character::complete::multispace0,
153-
nom::character::complete::char('('),
154-
nom::character::complete::multispace0,
146+
combinator::map(
147+
sequence::delimited(
148+
sequence::tuple((
149+
bytes::complete::tag("@"),
150+
character::complete::multispace0,
151+
bytes::complete::tag_no_case("points"),
152+
character::complete::multispace0,
153+
character::complete::char('('),
154+
character::complete::multispace0,
155155
)),
156-
nom::branch::alt((
157-
nom::sequence::delimited(
158-
nom::character::complete::char('"'),
159-
nom::bytes::complete::is_not("\""),
160-
nom::character::complete::char('"'),
156+
branch::alt((
157+
sequence::delimited(
158+
character::complete::char('"'),
159+
bytes::complete::is_not("\""),
160+
character::complete::char('"'),
161161
),
162-
nom::sequence::delimited(
163-
nom::character::complete::char('\''),
164-
nom::bytes::complete::is_not("'"),
165-
nom::character::complete::char('\''),
162+
sequence::delimited(
163+
character::complete::char('\''),
164+
bytes::complete::is_not("'"),
165+
character::complete::char('\''),
166166
),
167167
)),
168-
nom::sequence::tuple((
169-
nom::character::complete::multispace0,
170-
nom::character::complete::char(')'),
168+
sequence::tuple((
169+
character::complete::multispace0,
170+
character::complete::char(')'),
171171
)),
172172
),
173173
str::trim,

‎plugins/r/src/plugin.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use tmc_langs_framework::{
1212
command::TmcCommand,
1313
domain::{ExerciseDesc, RunResult, TestDesc},
1414
io::file_util,
15-
nom::{self, IResult},
15+
nom::IResult,
1616
zip::ZipArchive,
1717
LanguagePlugin, TmcError,
1818
};

‎tmc-langs-framework/src/plugin.rs‎

Lines changed: 40 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ use crate::io::{file_util, submission_processing, tmc_zip};
99
use crate::policy::StudentFilePolicy;
1010
pub use isolang::Language;
1111
use log::debug;
12-
use nom::{bytes::complete, combinator, error::ErrorKind, error::ParseError, sequence, IResult};
13-
use once_cell::sync::Lazy;
14-
use regex::Regex;
12+
use nom::{branch, bytes, character, combinator, multi, sequence, IResult};
1513
use std::collections::{HashMap, HashSet};
1614
use std::io::{Read, Seek, Write};
1715
use std::path::{Path, PathBuf};
@@ -448,39 +446,35 @@ pub trait LanguagePlugin {
448446
log::debug!("parsing points from {}", entry.path().display());
449447
let file_contents = file_util::read_file_to_string(entry.path())?;
450448

451-
let etc_parser = nom::combinator::value(Parse::Other, complete::take(1usize));
452-
let line_comment_parser = nom::combinator::value(
449+
let etc_parser = combinator::value(Parse::Other, bytes::complete::take(1usize));
450+
let line_comment_parser = combinator::value(
453451
Parse::LineComment,
454-
nom::sequence::pair(
455-
nom::bytes::complete::tag(Self::LINE_COMMENT),
456-
nom::bytes::complete::is_not("\n"),
452+
sequence::pair(
453+
bytes::complete::tag(Self::LINE_COMMENT),
454+
bytes::complete::is_not("\n"),
457455
),
458456
);
459457
let block_comment_parser: Box<dyn Fn(_) -> _> =
460458
if let Some(block_comment) = Self::BLOCK_COMMENT {
461-
Box::new(nom::combinator::value(
459+
Box::new(combinator::value(
462460
Parse::BlockComment,
463-
nom::sequence::pair(
464-
nom::bytes::complete::tag(block_comment.0),
465-
nom::bytes::complete::is_not(block_comment.1),
461+
sequence::pair(
462+
bytes::complete::tag(block_comment.0),
463+
bytes::complete::is_not(block_comment.1),
466464
),
467465
))
468466
} else {
469-
Box::new(nom::combinator::value(
467+
Box::new(combinator::value(
470468
Parse::Other,
471-
complete::take_while(|_| false),
469+
bytes::complete::take_while(|_| false),
472470
))
473471
};
474472
let points_parser =
475-
nom::combinator::map(Self::points_parser, |p| Parse::Points(p.to_string()));
473+
combinator::map(Self::points_parser, |p| Parse::Points(p.to_string()));
476474

477-
let parser = nom::multi::many0(nom::multi::many_till(
475+
let parser = multi::many0(multi::many_till(
478476
etc_parser,
479-
nom::branch::alt((
480-
line_comment_parser,
481-
block_comment_parser,
482-
points_parser,
483-
)),
477+
branch::alt((line_comment_parser, block_comment_parser, points_parser)),
484478
));
485479
let res: IResult<_, _> = parser(&file_contents);
486480
let (_, parsed) = res.unwrap();
@@ -502,10 +496,10 @@ pub trait LanguagePlugin {
502496
}
503497

504498
pub fn simple_delimited<'a>(limiter: char) -> impl Fn(&'a str) -> IResult<&'a str, &'a str> {
505-
nom::sequence::delimited(
506-
nom::character::complete::char(limiter),
507-
nom::bytes::complete::take_till(move |c| c == limiter),
508-
nom::character::complete::char(limiter),
499+
sequence::delimited(
500+
character::complete::char(limiter),
501+
bytes::complete::take_till(move |c| c == limiter),
502+
character::complete::char(limiter),
509503
)
510504
}
511505

@@ -579,31 +573,31 @@ mod test {
579573
}
580574

581575
fn points_parser<'a>(i: &'a str) -> IResult<&'a str, &'a str> {
582-
nom::combinator::map(
583-
nom::sequence::delimited(
584-
nom::sequence::tuple((
585-
nom::bytes::complete::tag("@"),
586-
nom::character::complete::multispace0,
587-
nom::bytes::complete::tag_no_case("points"),
588-
nom::character::complete::multispace0,
589-
nom::character::complete::char('('),
590-
nom::character::complete::multispace0,
576+
combinator::map(
577+
sequence::delimited(
578+
sequence::tuple((
579+
bytes::complete::tag("@"),
580+
character::complete::multispace0,
581+
bytes::complete::tag_no_case("points"),
582+
character::complete::multispace0,
583+
character::complete::char('('),
584+
character::complete::multispace0,
591585
)),
592-
nom::branch::alt((
593-
nom::sequence::delimited(
594-
nom::character::complete::char('"'),
595-
nom::bytes::complete::is_not("\""),
596-
nom::character::complete::char('"'),
586+
branch::alt((
587+
sequence::delimited(
588+
character::complete::char('"'),
589+
bytes::complete::is_not("\""),
590+
character::complete::char('"'),
597591
),
598-
nom::sequence::delimited(
599-
nom::character::complete::char('\''),
600-
nom::bytes::complete::is_not("'"),
601-
nom::character::complete::char('\''),
592+
sequence::delimited(
593+
character::complete::char('\''),
594+
bytes::complete::is_not("'"),
595+
character::complete::char('\''),
602596
),
603597
)),
604-
nom::sequence::tuple((
605-
nom::character::complete::multispace0,
606-
nom::character::complete::char(')'),
598+
sequence::tuple((
599+
character::complete::multispace0,
600+
character::complete::char(')'),
607601
)),
608602
),
609603
str::trim,

‎tmc-langs-util/src/task_executor.rs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -247,20 +247,3 @@ fn get_language_plugin(path: &Path) -> Result<Plugin, TmcError> {
247247
Err(TmcError::PluginNotFound(path.to_path_buf()))
248248
}
249249
}
250-
251-
#[cfg(test)]
252-
mod test {
253-
use super::*;
254-
255-
#[test]
256-
fn parses_available_points() {
257-
let points = get_available_points(Path::new("tests/data/get_available_points_1")).unwrap();
258-
assert!(points.is_empty());
259-
260-
let points = get_available_points(Path::new("tests/data/get_available_points_2")).unwrap();
261-
assert_eq!(points, &["1", "2", "3"]);
262-
263-
let points = get_available_points(Path::new("tests/data/get_available_points_3")).unwrap();
264-
assert_eq!(points, &["1"]);
265-
}
266-
}

0 commit comments

Comments
 (0)