Skip to content

Commit fcc06f9

Browse files
committed
Fix tests
1 parent f678369 commit fcc06f9

File tree

5 files changed

+38
-7
lines changed

5 files changed

+38
-7
lines changed

tests/rustfmt/main.rs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,25 +202,42 @@ fn rustfmt_emits_error_when_control_brace_style_is_always_next_line() {
202202
}
203203

204204
#[test]
205-
fn ignore_missing_sub_mod_false() {
205+
fn report_missing_sub_mod_error() {
206206
// Ensure that missing submodules cause module not found errors when trying to
207-
// resolve submodules with `skip_children=false` and `ignore_missing_submod=false`
207+
// resolve submodules with `skip_children=false` and `report_missing_submod=Error`
208208
let args = [
209-
"--config=skip_children=false,ignore_missing_submod=false",
209+
"--config=skip_children=false,report_missing_submod=Error",
210210
"tests/source/issue-5609.rs",
211211
];
212212
let (_stdout, stderr) = rustfmt(&args);
213213
// Module resolution fails because we're unable to find `missing_submod.rs`
214214
assert!(stderr.contains("missing_submod.rs does not exist"))
215215
}
216216

217+
#[test]
218+
fn report_missing_sub_mod_warn() {
219+
// Ensure that missing submodules cause module not found warnings when trying to
220+
// resolve submodules with `skip_children=false` and `report_missing_submod=Warn`
221+
let args = [
222+
"--emit=stdout",
223+
"--config=skip_children=false,report_missing_submod=Warn",
224+
"tests/source/issue-5609.rs",
225+
];
226+
let (stdout, stderr) = rustfmt(&args);
227+
// Module resolution succeed but we emit warnings because we're unable to find `missing_submod.rs`
228+
assert!(stderr.contains("missing_submod.rs does not exist"));
229+
230+
let target = read_to_string(PathBuf::from("tests/target/issue-5609.rs")).unwrap();
231+
assert!(stdout.ends_with(&target));
232+
}
233+
217234
#[test]
218235
fn ignore_missing_sub_mod_true() {
219236
// Ensure that missing submodules don't cause module not found errors when trying to
220-
// resolve submodules with `skip_children=false` and `ignore_missing_submod=true`.
237+
// resolve submodules with `skip_children=false` and `report_missing_submod=Ignore`.
221238
let args = [
222239
"--emit=stdout",
223-
"--config=skip_children=false,ignore_missing_submod=true",
240+
"--config=skip_children=false,report_missing_submod=Ignore",
224241
"tests/source/issue-5609.rs",
225242
];
226243
let (stdout, _stderr) = rustfmt(&args);

tests/source/issue-5609-2.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// rustfmt-report_missing_submod: Warn
2+
// rustfmt-skip_children: false
3+
4+
mod missing_submod;
5+
6+
fn test() {
7+
8+
}

tests/source/issue-5609.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// rustfmt-ignore_missing_submod: true
1+
// rustfmt-report_missing_submod: Ignore
22
// rustfmt-skip_children: false
33

44
mod missing_submod;

tests/target/issue-5609-2.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// rustfmt-report_missing_submod: Warn
2+
// rustfmt-skip_children: false
3+
4+
mod missing_submod;
5+
6+
fn test() {}

tests/target/issue-5609.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// rustfmt-ignore_missing_submod: true
1+
// rustfmt-report_missing_submod: Ignore
22
// rustfmt-skip_children: false
33

44
mod missing_submod;

0 commit comments

Comments
 (0)