Rollup of 4 pull requests by jhpratt · Pull Request #164545 · rust-lang/rust

jhpratt · 2026-10-18T23:05:31Z

Successful merges:

Normalize .. and . in diagnostic file paths #155569 (Normalize .. and . in diagnostic file paths)
Bump libc to v0.2.191 #163732 (Bump libc to v0.2.191)
[tiny] Remove some useless .into() calls #164532 ([tiny] Remove some useless .into() calls)
Clean up tests/rustdoc-html #164523 (Clean up tests/rustdoc-html)

Signed-off-by: arferreira <arfs.antonio@gmail.com>

@estebank

…ths, r=estebank Normalize .. and . in diagnostic file paths Fixes rust-lang#51349 Lexically normalize `.` and `..` in file paths when rendering diagnostics, so errors show `foo.rs` instead of `sub/../foo.rs`. Normalization is scoped to the new `FileNameDisplayPreference::Diagnostics` variant used by `SourceMap::filename_for_diagnostics`; `file!()`, debuginfo, and remapped/local/short paths are unchanged. Uses the unstable `Path::normalize_lexically`, `canonicalize` is avoided because it turns relative paths absolute, which broke the previous attempt in rust-lang#83345. Paths that `normalize_lexically` rejects (leading escapes, net-negative `..`) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a `$DIR/..` substitution so existing `.stderr` files that referenced auxiliary paths above `$DIR` keep matching. Previous attempt was rust-lang#68654. r? @estebank

Bump libc to v0.2.191 Various bug fixes and additions including getexecpath() support.

…bzol [tiny] Remove some useless `.into()` calls Detected while working on rust-lang#129249.

@Urgau

… r=Urgau Clean up `tests/rustdoc-html` Yet another one. This one is a bit different though because it made me realize that a `!has` was not checking anything so I fixed it. I'm considering more and more to remove the use of `!` or at least strongly restrict it. r? @Urgau

jhpratt · 2026-10-18T23:05:47Z

@bors r+ p=5 force

rust-bors · 2026-10-18T23:05:50Z

📌 Commit e394537 has been approved by jhpratt

It is now in the queue for this repository.

Rollup of 4 pull requests Successful merges: - #155569 (Normalize .. and . in diagnostic file paths) - #163732 (Bump libc to v0.2.191) - #164532 ([tiny] Remove some useless `.into()` calls) - #164523 (Clean up `tests/rustdoc-html`)

rust-bors · 2026-10-19T00:46:52Z

💔 Test for 0f3c4e9 failed: CI. Failed job:

auto - test-i686-msvc (web logs, enhanced plaintext logs)

jhpratt · 2026-10-19T01:01:55Z

@bors retry (seemingly spurious)

Rollup of 4 pull requests Successful merges: - #155569 (Normalize .. and . in diagnostic file paths) - #163732 (Bump libc to v0.2.191) - #164532 ([tiny] Remove some useless `.into()` calls) - #164523 (Clean up `tests/rustdoc-html`)

rust-log-analyzer · 2026-10-19T02:20:48Z

The job test-aarch64-msvc-2 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

failures:

---- source_map::tests::filename_for_diagnostics_verbose_keeps_parent_dir stdout ----

thread 'source_map::tests::filename_for_diagnostics_verbose_keeps_parent_dir' (4224) panicked at compiler\rustc_span\src\source_map\tests.rs:823:5:
assertion `left == right` failed
  left: "tests/sub/../helper.rs"
 right: "tests\\sub\\..\\helper.rs"
---- source_map::tests::filename_for_diagnostics_verbose_keeps_parent_dir stdout end ----
---- source_map::tests::filename_for_diagnostics_resolves_parent_dir stdout ----

thread 'source_map::tests::filename_for_diagnostics_resolves_parent_dir' (1968) panicked at compiler\rustc_span\src\source_map\tests.rs:809:5:
assertion `left == right` failed
  left: "tests/clean.rs"
---
Currently active steps:
test::CrateLibrustc { build_compiler: Compiler { stage: 1, host: aarch64-pc-windows-msvc, forced_compiler: false }, target: aarch64-pc-windows-msvc, crates: ["rustc-main", "rustc_abi", "rustc_arena", "rustc_ast", "rustc_ast_ir", "rustc_ast_lowering", "rustc_ast_passes", "rustc_ast_pretty", "rustc_attr_ir", "rustc_attr_parsing", "rustc_baked_icu_data", "rustc_borrowck", "rustc_builtin_macros", "rustc_codegen_llvm", "rustc_codegen_ssa", "rustc_const_eval", "rustc_crate_store", "rustc_data_structures", "rustc_driver", "rustc_driver_impl", "rustc_error_codes", "rustc_error_messages", "rustc_errors", "rustc_expand", "rustc_expand_queries", "rustc_feature", "rustc_fs_util", "rustc_graphviz", "rustc_hashes", "rustc_hir", "rustc_hir_analysis", "rustc_hir_id", "rustc_hir_pretty", "rustc_hir_typeck", "rustc_incremental", "rustc_index", "rustc_index_macros", "rustc_infer", "rustc_interface", "rustc_lexer", "rustc_lint", "rustc_lint_defs", "rustc_llvm", "rustc_log", "rustc_macros", "rustc_metadata", "rustc_middle", "rustc_mir_build", "rustc_mir_dataflow", "rustc_mir_transform", "rustc_monomorphize", "rustc_next_trait_solver", "rustc_parse", "rustc_parse_format", "rustc_passes", "rustc_pattern_analysis", "rustc_privacy", "rustc_proc_macro", "rustc_public", "rustc_public_bridge", "rustc_query_impl", "rustc_resolve", "rustc_sanitizers", "rustc_serialize", "rustc_session", "rustc_span", "rustc_structures", "rustc_symbol_mangling", "rustc_target", "rustc_thread_pool", "rustc_trait_selection", "rustc_traits", "rustc_transmute", "rustc_ty_utils", "rustc_ty_walk", "rustc_type_ir", "rustc_type_ir_macros", "rustc_windows_rc"] } at src\bootstrap\src\core\build_steps\test.rs:3444
test::Crate { build_compiler: Compiler { stage: 1, host: aarch64-pc-windows-msvc, forced_compiler: false }, target: aarch64-pc-windows-msvc, mode: Rustc, crates: ["rustc-main", "rustc_abi", "rustc_arena", "rustc_ast", "rustc_ast_ir", "rustc_ast_lowering", "rustc_ast_passes", "rustc_ast_pretty", "rustc_attr_ir", "rustc_attr_parsing", "rustc_baked_icu_data", "rustc_borrowck", "rustc_builtin_macros", "rustc_codegen_llvm", "rustc_codegen_ssa", "rustc_const_eval", "rustc_crate_store", "rustc_data_structures", "rustc_driver", "rustc_driver_impl", "rustc_error_codes", "rustc_error_messages", "rustc_errors", "rustc_expand", "rustc_expand_queries", "rustc_feature", "rustc_fs_util", "rustc_graphviz", "rustc_hashes", "rustc_hir", "rustc_hir_analysis", "rustc_hir_id", "rustc_hir_pretty", "rustc_hir_typeck", "rustc_incremental", "rustc_index", "rustc_index_macros", "rustc_infer", "rustc_interface", "rustc_lexer", "rustc_lint", "rustc_lint_defs", "rustc_llvm", "rustc_log", "rustc_macros", "rustc_metadata", "rustc_middle", "rustc_mir_build", "rustc_mir_dataflow", "rustc_mir_transform", "rustc_monomorphize", "rustc_next_trait_solver", "rustc_parse", "rustc_parse_format", "rustc_passes", "rustc_pattern_analysis", "rustc_privacy", "rustc_proc_macro", "rustc_public", "rustc_public_bridge", "rustc_query_impl", "rustc_resolve", "rustc_sanitizers", "rustc_serialize", "rustc_session", "rustc_span", "rustc_structures", "rustc_symbol_mangling", "rustc_target", "rustc_thread_pool", "rustc_trait_selection", "rustc_traits", "rustc_transmute", "rustc_ty_utils", "rustc_ty_walk", "rustc_type_ir", "rustc_type_ir_macros", "rustc_windows_rc"] } at src\bootstrap\src\core\build_steps\test.rs:3451
Build completed unsuccessfully in 1:04:22
make: *** [Makefile:117: ci-msvc-ps1] Error 1
  local time: Sun Oct 18 19:20:15 PDT 2026
  network time: Mon, 19 Oct 2026 02:20:15 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

rust-bors · 2026-10-19T02:21:44Z

💔 Test for 2af6209 failed: CI. Failed job:

auto - test-aarch64-msvc-2 (web logs, enhanced plaintext logs)

tgross35 · 2026-10-19T02:23:27Z

Looks like #155569

rust-bors · 2026-10-19T02:23:29Z

PR #155569, which is a member of this rollup, was unapproved.

arferreira and others added 11 commits October 16, 2026 16:55

Normalize .. and . in diagnostic file paths

90187d4

Print unnormalized diagnostic paths under --verbose

9e00810

Signed-off-by: arferreira <arfs.antonio@gmail.com>

Skip path normalization for paths without dot segments

ff3c159

Bump libc to v0.2.191

b728431

Clean up tests/rustdoc-html

f994970

Update no_delayed_bug stderr for path normalization

8a81376

[tiny] Remove some useless .into() calls

cb8b18d

Rollup merge of rust-lang#163732 - brad0:libc_crate, r=tgross35

69152e4

Bump libc to v0.2.191 Various bug fixes and additions including getexecpath() support.

Rollup merge of rust-lang#164532 - estebank:usesless-into-calls, r=ko…

2b475ec

…bzol [tiny] Remove some useless `.into()` calls Detected while working on rust-lang#129249.

rust-bors Bot added the rollup A PR which is a rollup label Oct 18, 2026

rust-bors Bot 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 Oct 18, 2026

This comment has been minimized.

Sign in to view

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

rust-bors Bot 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 Oct 19, 2026

rust-bors Bot mentioned this pull request Oct 19, 2026

Normalize .. and . in diagnostic file paths #155569

Open

This comment has been minimized.

Sign in to view

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

rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 19, 2026

tgross35 closed this Oct 19, 2026

rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 19, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 19, 2026

jhpratt deleted the rollup-HYxtbeX branch October 22, 2026 05:15

Navigation Menu

Repository navigation

Rollup of 4 pull requests - #164545

Rollup of 4 pull requests#164545
jhpratt wants to merge 11 commits into
rust-lang:mainfrom
jhpratt:rollup-HYxtbeX

jhpratt commented Oct 18, 2026

Uh oh!

jhpratt commented Oct 18, 2026

Uh oh!

rust-bors Bot commented Oct 18, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Oct 19, 2026

Uh oh!

jhpratt commented Oct 19, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Oct 19, 2026

Uh oh!

rust-bors Bot commented Oct 19, 2026

Uh oh!

tgross35 commented Oct 19, 2026

Uh oh!

rust-bors Bot commented Oct 19, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

jhpratt commented Oct 18, 2026

Uh oh!

jhpratt commented Oct 18, 2026

Uh oh!

rust-bors Bot commented Oct 18, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Oct 19, 2026

Uh oh!

jhpratt commented Oct 19, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Oct 19, 2026

Uh oh!

rust-bors Bot commented Oct 19, 2026

Uh oh!

tgross35 commented Oct 19, 2026

Uh oh!

rust-bors Bot commented Oct 19, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants