Remove extra removal from test path

[GuillaumeGomez]

I don't know how to describe it shortly so better show what it's doing instead. Currently, there is one extra "rust/" before the test folder when running tests:

failures:

---- [rustdoc] rust/tests/rustdoc/redirect.rs stdout ----

This is a bit annoying when copying the test path. This is due to the moving of the tests folder one level up, meaning we were trimming too much of the root_path.

Now it is again displaying the correct path:

failures:

---- [rustdoc] tests/rustdoc/redirect.rs stdout ----

[rustbot]

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

[albertlarsan68]

I should have verified all of the outputs.

Is there any other instance of this .parent().unwrap() scheme ?

[GuillaumeGomez]

There are a few places but they don't seem to impact the tests folder:

library/std/src/path.rs:2279:    /// `&self.parent().unwrap().parent().unwrap()` and so on. If the [`parent`] method returns
src/bootstrap/config.rs:819:        config.src = manifest_dir.parent().unwrap().parent().unwrap().to_owned();
src/bootstrap/test.rs:1729:                .arg(builder.cc(target).parent().unwrap().parent().unwrap());
src/tools/compiletest/src/runtest.rs:2933:        let src_root = self.config.src_base.parent().unwrap().parent().unwrap();
src/tools/compiletest/src/runtest.rs:3550:            Some(self.config.src_base.parent().unwrap().parent().unwrap().into()),
src/tools/compiletest/src/runtest.rs:3573:        let parent_build_dir = test_build_dir.parent().unwrap().parent().unwrap().parent().unwrap();
src/tools/rust-analyzer/crates/rust-analyzer/src/cli/load_cargo.rs:156:        let path = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap().parent().unwrap();
src/tools/rust-analyzer/crates/sourcegen/src/lib.rs:199:    let res = PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned();
src/tools/rust-analyzer/crates/test-utils/src/lib.rs:407:    PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned()

[albertlarsan68]

I corrected quite a few during the move, this one slipped through the cracks of not testing compiletest's output in this case.

Can a test be added ?

[GuillaumeGomez]

That's a good suggestion. Do we have tests for test runners already?

[albertlarsan68]

I don't think so. Should I open an issue ?

EDIT: There is already #47606, which has some discussion and does not have a definite answer.

[tmiasko]

@bors r+

[bors]

📌 Commit f46f923 has been approved by tmiasko

It is now in the queue for this repository.