diff options
| author | Caleb Cartwright <calebcartwright@users.noreply.github.com> | 2021-10-19 23:01:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 23:01:25 -0500 |
| commit | 923126348d012e8a81527de84ccb1cb1d9fde75c (patch) | |
| tree | 83cad4971c9540befdca393dd27fb14edb4a1952 /src/test | |
| parent | 9060bc5583f80a37530ee35a6cc2ddf1293d068f (diff) | |
| parent | 1ae5c35f8d2a0d2ce5d914a479839dc0f3eb70f9 (diff) | |
| download | rust-923126348d012e8a81527de84ccb1cb1d9fde75c.tar.gz rust-923126348d012e8a81527de84ccb1cb1d9fde75c.zip | |
Merge branch 'master' into 1.4.38-subtree
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/mod.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/test/mod.rs b/src/test/mod.rs index cb52346a13a..48d61289a9b 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -469,11 +469,6 @@ fn stdin_works_with_modified_lines() { #[test] fn stdin_disable_all_formatting_test() { init_log(); - match option_env!("CFG_RELEASE_CHANNEL") { - None | Some("nightly") => {} - // These tests require nightly. - _ => return, - } let input = String::from("fn main() { println!(\"This should not be formatted.\"); }"); let mut child = Command::new(rustfmt().to_str().unwrap()) .stdin(Stdio::piped()) @@ -694,7 +689,7 @@ fn read_significant_comments(file_name: &Path) -> HashMap<String, String> { reader .lines() .map(|line| line.expect("failed getting line")) - .take_while(|line| line_regex.is_match(line)) + .filter(|line| line_regex.is_match(line)) .filter_map(|line| { regex.captures_iter(&line).next().map(|capture| { ( |