Skip to content

Commit d35ebf7

Browse files
calebcartwrighttopecongiro
authored andcommitted
add support for formatting files in subdirectories of tests (#3777)
1 parent 09a028b commit d35ebf7

File tree

16 files changed

+416
-45
lines changed

16 files changed

+416
-45
lines changed

Diff for: src/cargo-fmt/main.rs

+359-45
Large diffs are not rendered by default.

Diff for: tests/nested-test-files/empty-tests-dir/Cargo.toml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[package]
2+
name = "empty-tests-dir"
3+
version = "0.1.0"
4+
authors = ["rustfmt devs <[email protected]>"]
5+
6+
[dependencies]

Diff for: tests/nested-test-files/empty-tests-dir/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fn foo() {}

Diff for: tests/nested-test-files/no-tests-dir/Cargo.toml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[package]
2+
name = "no-tests"
3+
version = "0.1.0"
4+
authors = ["rustfmt devs <[email protected]>"]
5+
6+
[dependencies]

Diff for: tests/nested-test-files/no-tests-dir/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fn foo() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[package]
2+
name = "foo"
3+
version = "0.1.0"
4+
authors = ["rustfmt devs <[email protected]>"]
5+
6+
[dependencies]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fn foo() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#[test]
2+
fn test2() {
3+
assert!(true);
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#[test]
2+
fn test1() {
3+
assert_eq!(1, 1);
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[package]
2+
name = "root-and-nested-tests"
3+
version = "0.1.0"
4+
authors = ["rustfmt devs <[email protected]>"]
5+
edition = "2018"
6+
7+
[dependencies]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fn foo() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#[test]
2+
fn test2() {
3+
assert!(true);
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#[test]
2+
fn test1() {
3+
assert_eq!(1, 1);
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#[test]
2+
fn test_truth() {
3+
assert_eq!!(true, true);
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#[test]
2+
fn test_false() {
3+
assert_ne!(false, true);
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#[test]
2+
fn test_add() {
3+
assert_eq!(9, 4 + 5);
4+
}

0 commit comments

Comments
 (0)