Skip to content

Try unremapping compiler sources #142377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2025
Merged

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Jun 11, 2025

See #t-compiler/help > Span pointing to wrong file location (rustc-dev component).

This PR is a follow-up to #141751 regarding the compiler side.

Specifically we now take into account the CFG_VIRTUAL_RUSTC_DEV_SOURCE_BASE_DIR env from #141751 when trying to unremap sources from $sysroot/lib/rustlib/rustc-src/rust (the rustc-dev component install directory).

Best reviewed commit by commit.

cc @samueltardieu
r? @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 11, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 11, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@Urgau Urgau force-pushed the unremap-rustc-dev branch from 2d8394a to 7c1d47a Compare June 11, 2025 18:30
@bors

This comment was marked as resolved.

@Urgau Urgau force-pushed the unremap-rustc-dev branch from 7c1d47a to 5dca84f Compare June 12, 2025 16:50
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One doc nit, but impl seems good to me. Thanks for working on this!

@jieyouxu
Copy link
Member

@rustbot author (doc nit)

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 14, 2025
@Urgau Urgau force-pushed the unremap-rustc-dev branch from 5dca84f to 2341c7d Compare June 14, 2025 13:28
@rustbot rustbot added the A-rustc-dev-guide Area: rustc-dev-guide label Jun 14, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2025

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, r=me once PR CI is 🥗

@Urgau
Copy link
Member Author

Urgau commented Jun 14, 2025

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Jun 14, 2025

📌 Commit 2341c7d has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 Jun 14, 2025
fmease added a commit to fmease/rust that referenced this pull request Jun 14, 2025
Try unremapping compiler sources

See [#t-compiler/help > Span pointing to wrong file location (`rustc-dev` component)](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/Span.20pointing.20to.20wrong.20file.20location.20.28.60rustc-dev.60.20component.29/with/521087083).

This PR is a follow-up to rust-lang#141751 regarding the compiler side.

Specifically we now take into account the `CFG_VIRTUAL_RUSTC_DEV_SOURCE_BASE_DIR` env from rust-lang#141751 when trying to unremap sources from `$sysroot/lib/rustlib/rustc-src/rust` (the `rustc-dev` component install directory).

Best reviewed commit by commit.

cc `@samueltardieu`
r? `@jieyouxu`
bors added a commit that referenced this pull request Jun 15, 2025
Rollup of 10 pull requests

Successful merges:

 - #133952 (Remove wasm legacy abi)
 - #134661 (Reduce precedence of expressions that have an outer attr)
 - #141769 (Move metadata object generation for dylibs to the linker code )
 - #141864 (Handle win32 separator for cygwin paths)
 - #142347 (Async drop - fix for StorageLive/StorageDead codegen for pinned future)
 - #142377 (Try unremapping compiler sources)
 - #142389 (Apply ABI attributes on return types in `rustc_codegen_cranelift`)
 - #142470 (Add some missing mailmap entries)
 - #142481 (Add `f16` inline asm support for LoongArch)
 - #142509 (bump std libc dependency)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 15, 2025
Try unremapping compiler sources

See [#t-compiler/help > Span pointing to wrong file location (`rustc-dev` component)](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/Span.20pointing.20to.20wrong.20file.20location.20.28.60rustc-dev.60.20component.29/with/521087083).

This PR is a follow-up to rust-lang#141751 regarding the compiler side.

Specifically we now take into account the `CFG_VIRTUAL_RUSTC_DEV_SOURCE_BASE_DIR` env from rust-lang#141751 when trying to unremap sources from `$sysroot/lib/rustlib/rustc-src/rust` (the `rustc-dev` component install directory).

Best reviewed commit by commit.

cc ``@samueltardieu``
r? ``@jieyouxu``
bors added a commit that referenced this pull request Jun 15, 2025
Rollup of 9 pull requests

Successful merges:

 - #133952 (Remove wasm legacy abi)
 - #141769 (Move metadata object generation for dylibs to the linker code )
 - #141864 (Handle win32 separator for cygwin paths)
 - #142347 (Async drop - fix for StorageLive/StorageDead codegen for pinned future)
 - #142377 (Try unremapping compiler sources)
 - #142389 (Apply ABI attributes on return types in `rustc_codegen_cranelift`)
 - #142470 (Add some missing mailmap entries)
 - #142481 (Add `f16` inline asm support for LoongArch)
 - #142509 (bump std libc dependency)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

@bors r-
#142533 (comment)

@Urgau Urgau force-pushed the unremap-rustc-dev branch from 2341c7d to 268fbfe Compare June 15, 2025 15:20
@Urgau
Copy link
Member Author

Urgau commented Jun 15, 2025

Added an ignore-stage1 like many other ui-fulldeps tests have, let's see if it fixes the CI failure.

@bors2 try jobs=x86_64-gnu-llvm-20-3

@rust-bors

This comment was marked as outdated.

@Urgau

This comment was marked as outdated.

@rust-bors

This comment was marked as outdated.

@Urgau

This comment was marked as outdated.

@rust-bors

This comment was marked as outdated.

@Urgau
Copy link
Member Author

Urgau commented Jun 15, 2025

@bors2 try jobs=x86_64-gnu-llvm-20-3

@rust-bors
Copy link

rust-bors bot commented Jun 15, 2025

⌛ Trying commit 268fbfe with merge da6d304

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jun 15, 2025
Try unremapping compiler sources

See [#t-compiler/help > Span pointing to wrong file location (`rustc-dev` component)](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/Span.20pointing.20to.20wrong.20file.20location.20.28.60rustc-dev.60.20component.29/with/521087083).

This PR is a follow-up to #141751 regarding the compiler side.

Specifically we now take into account the `CFG_VIRTUAL_RUSTC_DEV_SOURCE_BASE_DIR` env from #141751 when trying to unremap sources from `$sysroot/lib/rustlib/rustc-src/rust` (the `rustc-dev` component install directory).

Best reviewed commit by commit.

cc `@samueltardieu`
r? `@jieyouxu`

try-job: x86_64-gnu-llvm-20-3
@rust-bors
Copy link

rust-bors bot commented Jun 15, 2025

☀️ Try build successful (CI)
Build commit: da6d304 (da6d3040873ac092c5069887b1ccf943806d2b76, parent: 75e7cf5f85aad82331a38deff24845b63eaf30f3)

@Urgau
Copy link
Member Author

Urgau commented Jun 15, 2025

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Jun 15, 2025

📌 Commit 268fbfe has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 Jun 15, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 17, 2025
Try unremapping compiler sources

See [#t-compiler/help > Span pointing to wrong file location (`rustc-dev` component)](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/Span.20pointing.20to.20wrong.20file.20location.20.28.60rustc-dev.60.20component.29/with/521087083).

This PR is a follow-up to rust-lang#141751 regarding the compiler side.

Specifically we now take into account the `CFG_VIRTUAL_RUSTC_DEV_SOURCE_BASE_DIR` env from rust-lang#141751 when trying to unremap sources from `$sysroot/lib/rustlib/rustc-src/rust` (the `rustc-dev` component install directory).

Best reviewed commit by commit.

cc `@samueltardieu`
r? `@jieyouxu`
bors added a commit that referenced this pull request Jun 17, 2025
Rollup of 10 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142371 (avoid `&mut P<T>` in `visit_expr` etc methods)
 - #142377 (Try unremapping compiler sources)
 - #142517 (Windows: Use anonymous pipes in Command)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-bors bot added a commit that referenced this pull request Jun 17, 2025
Rollup of 10 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142371 (avoid `&mut P<T>` in `visit_expr` etc methods)
 - #142377 (Try unremapping compiler sources)
 - #142517 (Windows: Use anonymous pipes in Command)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
<!-- homu-ignore:start -->
[Create a similar rollup](https://bors.rust-lang.org/queue/rust?prs=138538,141946,142216,142371,142377,142517,142542,142563,142570,142584)
<!-- homu-ignore:end -->
try-job: dist-aarch64-apple
bors added a commit that referenced this pull request Jun 18, 2025
Rollup of 6 pull requests

Successful merges:

 - #135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
 - #138237 (Get rid of `EscapeDebugInner`.)
 - #141614 (lint direct use of rustc_type_ir )
 - #142123 (Implement initial support for timing sections (`--json=timings`))
 - #142377 (Try unremapping compiler sources)
 - #142674 (remove duplicate crash test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bf38e5d into rust-lang:master Jun 19, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 19, 2025
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jun 19, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
 - rust-lang/rust#138237 (Get rid of `EscapeDebugInner`.)
 - rust-lang/rust#141614 (lint direct use of rustc_type_ir )
 - rust-lang/rust#142123 (Implement initial support for timing sections (`--json=timings`))
 - rust-lang/rust#142377 (Try unremapping compiler sources)
 - rust-lang/rust#142674 (remove duplicate crash test)

r? `@ghost`
`@rustbot` modify labels: rollup
@Urgau Urgau added the relnotes Marks issues that should be documented in the release notes of the next release. label Jun 29, 2025
tautschnig pushed a commit to model-checking/verify-rust-std that referenced this pull request Jul 3, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang#135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
 - rust-lang#138237 (Get rid of `EscapeDebugInner`.)
 - rust-lang#141614 (lint direct use of rustc_type_ir )
 - rust-lang#142123 (Implement initial support for timing sections (`--json=timings`))
 - rust-lang#142377 (Try unremapping compiler sources)
 - rust-lang#142674 (remove duplicate crash test)

r? `@ghost`
`@rustbot` modify labels: rollup
wip-sync pushed a commit to NetBSD/pkgsrc-wip that referenced this pull request Aug 11, 2025
Pkgsrc changes:
 * Adjust patches to adapt to upstream changes and new versions.
 * assosicated checksums

Upstream changes relative to 1.88.0:

Version 1.89.0 (2025-08-07)
==========================

Language
--------
- [Stabilize explicitly inferred const arguments (`feature(generic_arg_infer)`)]
  (rust-lang/rust#141610)
- [Add a warn-by-default `mismatched_lifetime_syntaxes` lint.]
  (rust-lang/rust#138677)
  This lint detects when the same lifetime is referred to by
  different syntax categories between function arguments and return
  values, which can be confusing to read, especially in unsafe
  code.  This lint supersedes the warn-by-default `elided_named_lifetimes`
  lint.
- [Expand `unpredictable_function_pointer_comparisons` to also lint
  on function pointer comparisons in external macros]
  (rust-lang/rust#134536)
- [Make the `dangerous_implicit_autorefs` lint deny-by-default]
  (rust-lang/rust#141661)
- [Stabilize the avx512 target features]
  (rust-lang/rust#138940)
- [Stabilize `kl` and `widekl` target features for x86]
  (rust-lang/rust#140766)
- [Stabilize `sha512`, `sm3` and `sm4` target features for x86]
  (rust-lang/rust#140767)
- [Stabilize LoongArch target features `f`, `d`, `frecipe`, `lasx`,
  `lbt`, `lsx`, and `lvz`]
  (rust-lang/rust#135015)
- [Remove `i128` and `u128` from `improper_ctypes_definitions`]
  (rust-lang/rust#137306)
- [Stabilize `repr128` (`#[repr(u128)]`, `#[repr(i128)]`)]
  (rust-lang/rust#138285)
- [Allow `#![doc(test(attr(..)))]` everywhere]
  (rust-lang/rust#140560)
- [Extend temporary lifetime extension to also go through tuple
  struct and tuple variant constructors]
  (rust-lang/rust#140593)

Compiler
--------
- [Default to non-leaf frame pointers on aarch64-linux]
  (rust-lang/rust#140832)
- [Enable non-leaf frame pointers for Arm64EC Windows]
  (rust-lang/rust#140862)
- [Set Apple frame pointers by architecture]
  (rust-lang/rust#141797)

Platform Support
----------------
- [Add new Tier-3 targets `loongarch32-unknown-none` and
  `loongarch32-unknown-none-softfloat`]
  (rust-lang/rust#142053)

Refer to Rust's [platform support page][platform-support-doc]
for more information on Rust's tiered platform support.

[platform-support-doc]: https://doc.rust-lang.org/rustc/platform-support.html

Libraries
---------
- [Specify the base path for `file!`]
  (rust-lang/rust#134442)
- [Allow storing `format_args!()` in a variable]
  (rust-lang/rust#140748)
- [Add `#[must_use]` to `[T; N]::map`]
  (rust-lang/rust#140957)
- [Implement `DerefMut` for `Lazy{Cell,Lock}`]
  (rust-lang/rust#129334)
- [Implement `Default` for `array::IntoIter`]
  (rust-lang/rust#141574)
- [Implement `Clone` for `slice::ChunkBy`]
  (rust-lang/rust#138016)
- [Implement `io::Seek` for `io::Take`]
  (rust-lang/rust#138023)

Stabilized APIs
---------------

- [`NonZero<char>`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZero.html)
- Many intrinsics for x86, not enumerated here
  - [AVX512 intrinsics](rust-lang/rust#111137)
  - [`SHA512`, `SM3` and `SM4` intrinsics]
    (rust-lang/rust#126624)
- [`File::lock`]
  (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.lock)
- [`File::lock_shared`]
  (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.lock_shared)
- [`File::try_lock`]
  (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.try_lock)
- [`File::try_lock_shared`]
  (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.try_lock_shared)
- [`File::unlock`]
  (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.unlock)
- [`NonNull::from_ref`]
  (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.from_ref)
- [`NonNull::from_mut`]
  (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.from_mut)
- [`NonNull::without_provenance`]
  (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.without_provenance)
- [`NonNull::with_exposed_provenance`]
  (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.with_exposed_provenance)
- [`NonNull::expose_provenance`]
  (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.expose_provenance)
- [`OsString::leak`]
  (https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.leak)
- [`PathBuf::leak`]
  (https://doc.rust-lang.org/stable/std/path/struct.PathBuf.html#method.leak)
- [`Result::flatten`]
  (https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.flatten)
- [`std::os::linux::net::TcpStreamExt::quickack`]
  (https://doc.rust-lang.org/stable/std/os/linux/net/trait.TcpStreamExt.html#tymethod.quickack)
- [`std::os::linux::net::TcpStreamExt::set_quickack`]
  (https://doc.rust-lang.org/stable/std/os/linux/net/trait.TcpStreamExt.html#tymethod.set_quickack)

These previously stable APIs are now stable in const contexts:

- [`<[T; N]>::as_mut_slice`]
  (https://doc.rust-lang.org/stable/std/primitive.array.html#method.as_mut_slice)
- [`<[u8]>::eq_ignore_ascii_case`]
  (https://doc.rust-lang.org/stable/std/primitive.slice.html#impl-%5Bu8%5D/method.eq_ignore_ascii_case)
- [`str::eq_ignore_ascii_case`]
  (https://doc.rust-lang.org/stable/std/primitive.str.html#impl-str/method.eq_ignore_ascii_case)

Cargo
-----
- [`cargo fix` and `cargo clippy --fix` now default to the same
  Cargo target selection as other build commands.]
  (rust-lang/cargo#15192) Previously it
  would apply to all targets (like binaries, examples, tests, etc.).
  The `--edition` flag still applies to all targets.

- [Stabilize doctest-xcompile.]
  (rust-lang/cargo#15462) Doctests are
  now tested when cross-compiling. Just like other tests, it will
  use the [`runner` setting]
  (https://doc.rust-lang.org/cargo/reference/config.html#targettriplerunner)
  to run the tests. If you need to disable tests for a target, you
  can use the [ignore doctest attribute]
  (https://doc.rust-lang.org/rustdoc/write-documentation/documentation-tests.html#ignoring-targets)
  to specify the targets to ignore.

Rustdoc
-----
- [On mobile, make the sidebar full width and linewrap]
  (rust-lang/rust#139831). This makes long
  section and item names much easier to deal with on mobile.

Compatibility Notes
-------------------
- [Make `missing_fragment_specifier` an unconditional error]
  (rust-lang/rust#128425)
- [Enabling the `neon` target feature on `aarch64-unknown-none-softfloat`
  causes a warning]
  (rust-lang/rust#135160) because mixing
  code with and without that target feature is not properly supported
  by LLVM
- [Sized Hierarchy: Part I](rust-lang/rust#137944)
  - Introduces a small breaking change affecting `?Sized` bounds
    on impls on recursive types which contain associated type
    projections. It is not expected to affect any existing published
    crates. Can be fixed by refactoring the involved types or opting
    into the `sized_hierarchy` unstable feature. See the [FCP report]
    (rust-lang/rust#137944 (comment))
    for a code example.
- The warn-by-default `elided_named_lifetimes` lint is [superseded
  by the warn-by-default `mismatched_lifetime_syntaxes` lint.]
  (rust-lang/rust#138677)
- [Error on recursive opaque types earlier in the type checker]
  (rust-lang/rust#139419)
- [Type inference side effects from requiring element types of
  array repeat expressions are `Copy` are now only available at the
  end of type checking]
  (rust-lang/rust#139635)

- [The deprecated accidentally-stable
  `std::intrinsics::{copy,copy_nonoverlapping,write_bytes}` are now
  proper intrinsics]
  (rust-lang/rust#139916). There are no
  debug assertions guarding against UB, and they cannot be coerced
  to function pointers.
- [Remove long-deprecated `std::intrinsics::drop_in_place`]
  (rust-lang/rust#140151)
- [Make well-formedness predicates no longer coinductive]
  (rust-lang/rust#140208)
- [Remove hack when checking impl method compatibility]
  (rust-lang/rust#140557)
- [Remove unnecessary type inference due to built-in trait object impls]
  (rust-lang/rust#141352)
- [Lint against "stdcall", "fastcall", and "cdecl" on non-x86-32 targets]
  (rust-lang/rust#141435)
- [Future incompatibility warnings relating to the never type (`!`)
  are now reported in dependencies]
  (rust-lang/rust#141937)
- [Ensure `std::ptr::copy_*` intrinsics also perform the static
  self-init checks]
  (rust-lang/rust#142575)

Internal Changes
----------------

These changes do not affect any public interfaces of Rust, but they represent
significant improvements to the performance or internals of rustc and related
tools.

- [Correctly un-remap compiler sources paths with the `rustc-dev` component]
  (rust-lang/rust#142377)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants