compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout#139695

jieyouxu · 2025-04-12T01:59:28Z

compiletest already practically assumes UTF-8 paths everywhere. Use camino's {Utf8Path,Utf8PathBuf} consistently throughout compiletest to enforce UTF-8 path assumptions.

r? @Kobzol (or compiler/bootstrap)

rustbot · 2025-04-12T01:59:35Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

jieyouxu · 2025-04-12T03:20:02Z

@rustbot author

rustbot · 2025-04-12T03:20:06Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

jieyouxu · 2025-04-12T06:47:51Z

At places there's more ceremony that I would've liked... And also I didn't realize rustdoc-gui-test uses compiletest as a crate 🤔 Opening for feedback for now.

@rustbot ready

Kobzol · 2025-04-12T08:23:01Z

I also did this in opt-dist, dealing with the unwraps everywhere got annoying fast. Some formatting placeholders could now be inlined ({}, x -> {x}), but that's not worth fussing over.

I wonder if this will break anything on Windows or elsewhere, as the paths there can be.. funny. Let's see.

@bors r+

bors · 2025-04-12T08:23:05Z

📌 Commit c003957 has been approved by Kobzol

It is now in the queue for this repository.

…obzol compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout compiletest already practically assumes UTF-8 paths everywhere. Use `camino`'s `{Utf8Path,Utf8PathBuf}` consistently throughout compiletest to enforce UTF-8 path assumptions. r? `@Kobzol` (or compiler/bootstrap)

…enton Rollup of 11 pull requests Successful merges: - rust-lang#138972 (std: Fix build for NuttX targets) - rust-lang#139177 (Use -C target-cpu=z13 on s390x vector test) - rust-lang#139511 (libtest: Pass the test's panic payload as Option instead of Result) - rust-lang#139605 (update ```miniz_oxide``` to 0.8.8) - rust-lang#139618 (compiletest: Make `SUGGESTION` annotations viral) - rust-lang#139677 (Fix profiler_builtins build script to handle full path to profiler lib) - rust-lang#139683 (Use `with_native_path` for Windows) - rust-lang#139695 (compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout) - rust-lang#139710 (Move `args` into `std::sys`) - rust-lang#139721 (End all lines in src/stage0 with trailing newline) - rust-lang#139726 (Move `select_unpredictable` to the `hint` module) r? `@ghost` `@rustbot` modify labels: rollup

ChrisDenton · 2025-04-13T11:47:14Z

failed in rollup #139742 (comment)

@bors r-

jieyouxu · 2025-04-13T11:55:56Z

Yeah, I think that's ~~cfg(windows)'d~~ cfg(not(unix))'d...

Since compiletest already assumes UTF-8 paths and does not try to be robust against non-UTF-8 paths.

jieyouxu · 2025-04-13T12:00:29Z

Fixed a &Path

@bors r=Kobzol

bors · 2025-04-13T12:00:32Z

📌 Commit 957324b has been approved by Kobzol

It is now in the queue for this repository.

…obzol compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout compiletest already practically assumes UTF-8 paths everywhere. Use `camino`'s `{Utf8Path,Utf8PathBuf}` consistently throughout compiletest to enforce UTF-8 path assumptions. r? `@Kobzol` (or compiler/bootstrap)

…obzol compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout compiletest already practically assumes UTF-8 paths everywhere. Use `camino`'s `{Utf8Path,Utf8PathBuf}` consistently throughout compiletest to enforce UTF-8 path assumptions. r? ``@Kobzol`` (or compiler/bootstrap)

…enton Rollup of 12 pull requests Successful merges: - rust-lang#138744 (Add methods to TCP and UDP sockets to modify hop limit (refresh of rust-lang#94678)) - rust-lang#138962 (Expect an array when expected and acutal types are both arrays during cast) - rust-lang#139001 (add `naked_functions_rustic_abi` feature gate) - rust-lang#139379 (Use delayed bug for normalization errors in drop elaboration) - rust-lang#139582 (Various coercion cleanups) - rust-lang#139628 (Suggest remove redundant `$()?` around `vis`) - rust-lang#139644 (Micro-optimize `InstSimplify`'s `simplify_primitive_clone`) - rust-lang#139666 (cleanup `mir_borrowck`) - rust-lang#139674 (In `rustc_mir_transform`, iterate over index newtypes instead of ints) - rust-lang#139695 (compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout) - rust-lang#139722 (Move some things to rustc_type_ir) - rust-lang#139740 (Convert `tests/ui/lint/dead-code/self-assign.rs` to a known-bug test) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 9 pull requests Successful merges: - rust-lang#138336 (Improve `-Z crate-attr` diagnostics) - rust-lang#139636 (Encode dep node edge count as u32 instead of usize) - rust-lang#139666 (cleanup `mir_borrowck`) - rust-lang#139695 (compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout) - rust-lang#139699 (Proactively update coroutine drop shim's phase to account for later passes applied during shim query) - rust-lang#139718 (enforce unsafe attributes in pre-2024 editions by default) - rust-lang#139722 (Move some things to rustc_type_ir) - rust-lang#139760 (UI tests: migrate remaining compile time `error-pattern`s to line annotations when possible) - rust-lang#139776 (Switch attrs to `diagnostic::on_unimplemented`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139695 - jieyouxu:compiletest-utf8path, r=Kobzol compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout compiletest already practically assumes UTF-8 paths everywhere. Use `camino`'s `{Utf8Path,Utf8PathBuf}` consistently throughout compiletest to enforce UTF-8 path assumptions. r? ```@Kobzol``` (or compiler/bootstrap)

rustbot assigned Kobzol Apr 12, 2025

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 12, 2025

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 12, 2025

jieyouxu force-pushed the compiletest-utf8path branch from f9dda46 to 17c368e Compare April 12, 2025 03:23

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2025

ChrisDenton mentioned this pull request Apr 13, 2025

Rollup of 11 pull requests #139742

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 13, 2025

jieyouxu added 3 commits April 13, 2025 19:56

compiletest: add camino for UTF-8 path handling

b203d40

compiletest: consistently use {Utf8Path,Utf8PathBuf}

e24b0c8

Since compiletest already assumes UTF-8 paths and does not try to be robust against non-UTF-8 paths.

rustdoc-gui-test: pass a camino::Utf8PathBuf to compiletest

957324b

jieyouxu force-pushed the compiletest-utf8path branch from c003957 to 957324b Compare April 13, 2025 11:59

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 13, 2025

ChrisDenton mentioned this pull request Apr 13, 2025

Rollup of 13 pull requests #139754

Closed

ChrisDenton mentioned this pull request Apr 13, 2025

Rollup of 12 pull requests #139755

Closed

jhpratt mentioned this pull request Apr 14, 2025

Rollup of 9 pull requests #139781

Merged

bors merged commit 6fe6985 into rust-lang:master Apr 14, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone Apr 14, 2025

jieyouxu deleted the compiletest-utf8path branch April 14, 2025 10:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout#139695