Skip to content

Commit d510f38

Browse files
committed
Revert "Fix dev check rejecting exercises with CRLF line endings"
1 parent 2f99667 commit d510f38

1 file changed

Lines changed: 1 addition & 26 deletions

File tree

src/dev/check.rs

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ fn check_info_file_exercises(info_file: &InfoFile) -> Result<HashSet<PathBuf>> {
118118
);
119119
}
120120

121-
let contains_tests = exercise_has_tests(&file_buf);
121+
let contains_tests = file_buf.contains("#[test]\n");
122122
if exercise_info.test {
123123
if !contains_tests {
124124
bail!(
@@ -139,13 +139,6 @@ fn check_info_file_exercises(info_file: &InfoFile) -> Result<HashSet<PathBuf>> {
139139
Ok(paths)
140140
}
141141

142-
// Check if the exercise contains `#[test]`-annotated tests.
143-
// CRLF line endings are normalized first so that the check doesn't fail
144-
// on files with Windows line endings (e.g. `#[test]\r\n`).
145-
fn exercise_has_tests(file_content: &str) -> bool {
146-
file_content.replace("\r\n", "\n").contains("#[test]\n")
147-
}
148-
149142
// Check `dir` for unexpected files.
150143
// Only Rust files in `allowed_rust_files` and `README.md` files are allowed.
151144
// Only one level of directory nesting is allowed.
@@ -403,21 +396,3 @@ pub fn check(require_solutions: bool) -> Result<()> {
403396
}
404397

405398
const SKIP_CHECK_UNSOLVED_HINT: &str = "If this is an introduction exercise that is intended to be already solved, add `skip_check_unsolved = true` to the exercise's metadata in the `info.toml` file";
406-
407-
#[cfg(test)]
408-
mod tests {
409-
use super::*;
410-
411-
#[test]
412-
fn detects_tests_in_files_with_crlf_line_endings() {
413-
let content = "fn main() {}\r\n\r\n#[cfg(test)]\r\nmod tests {\r\n #[test]\r\n fn it_works() {}\r\n}\r\n";
414-
assert!(exercise_has_tests(content));
415-
}
416-
417-
#[test]
418-
fn detects_tests_in_files_with_lf_line_endings() {
419-
let content =
420-
"fn main() {}\n\n#[cfg(test)]\nmod tests {\n #[test]\n fn it_works() {}\n}\n";
421-
assert!(exercise_has_tests(content));
422-
}
423-
}

0 commit comments

Comments
 (0)