bootstrap: show diagnostics relative to rustc src dir by RalfJung · Pull Request #132390 · rust-lang/rust (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation27 Commits3 Checks6 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot added 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)

labels

Oct 31, 2024

jieyouxu added S-blocked

Status: Blocked on something else such as an RFC or other implementation work.

and removed S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

labels

Oct 31, 2024

jieyouxu added S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

and removed S-blocked

Status: Blocked on something else such as an RFC or other implementation work.

labels

Oct 31, 2024

This comment has been minimized.

@RalfJung by "Depends on rust-lang/cargo#14752" do you mean this PR is blocked on the cargo PR being merged and synced first?

That PR needs to propagate to bootstrap cargo.

bors added a commit to rust-lang/cargo that referenced this pull request

Oct 31, 2024

add unstable -Zroot-dir flag to configure the path from which rustc should be invoked

This implements the proposal described [here](#9887 (comment)): we add a new flag, for now called -Zroot-dir, that configures the directory relative to which rustc is given the crate root filenames to build. (Files outside this directory are passed absolutely.)

This is necessary to be able to fix (no github don't close that issue yet) rust-lang/rust#128726: in multi-workspace repositories that use scripts to manage a whole bunch of cargo invocations, currently the output cargo+rustc produce is often hard or even impossible to interpret for both human and machine consumption. This is because directories in the output are always relative to the workspace root, but when cargo is invoked many times for different workspaces, it is quite unclear what the workspace root is for the invocation that failed.

So I suggest we should have a new flag that the build script in such a repo can set to the consistent "root dir" that the user would recognize as such (e.g., the root of the rustc source tree), and all paths emitted by cargo and rustc should be relative to that directory.

I don't know all the places that cargo itself emits paths (if any), but this PR changes the way we invoke rustc to honor the new flag, so all paths emitted by rustc will be relative to the -Zroot-dir.

See rust-lang/rust#132390 for the changes needed in rustc bootstrap to wire this up; together, that suffices to finally properly show errors in RA for all parts of the rustc src tree. :)

RalfJung added S-blocked

Status: Blocked on something else such as an RFC or other implementation work.

and removed S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

labels

Nov 2, 2024

albertlarsan68 added S-waiting-on-author

Status: This is awaiting some action (such as code changes or more information) from the author.

and removed S-blocked

Status: Blocked on something else such as an RFC or other implementation work.

labels

Nov 2, 2024

@RalfJung the cargo side has been synced, r=me when CI is green after a rebase :)

We need to wait until the cargo PR is part of the bootstrap toolchain, right?

Yeah this will have to wait a few weeks, unfortunateltly.

jieyouxu added S-blocked

Status: Blocked on something else such as an RFC or other implementation work.

and removed S-waiting-on-author

Status: This is awaiting some action (such as code changes or more information) from the author.

labels

Nov 2, 2024

This comment has been minimized.

The next beta branches on November 22, so I guess the bootstrap bump will be shortly after that.

This was referenced

Nov 18, 2024

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-blocked

Status: Blocked on something else such as an RFC or other implementation work.

labels

Nov 30, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request

Nov 30, 2024

Looks like this will change the file paths printed in panics that point at the standard library, by including the leading library/. @rust-lang/libs that's an unstable implementation detail we are allowed to change, I assume?

I think that's fine, especially since the rust-src component does ship with that library/ part too.

A downside is that this adds a little bit of bloat, making every standard library path in the binary 8 bytes longer. It's still not much even if all ~1500 files are referenced, but I wonder if some size-sensitive embedded folks will notice.

This comment has been minimized.

bors 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

Dec 1, 2024

@rust-lang/cargo seems like there's again a problem with that cargo path logic...

I found a different way to make this work, by adjusting the patch that was added in #133533.
@rust-lang/bootstrap could you take a look?

Note that if snapbox ever removes their CARGO_RUSTC_CURRENT_DIR case (which arguably they should, as that env var no longer officially exists), this will break again. The proper solution for this is rust-lang/libs-team#478. But I hope since @epage is snapbox maintainer, they will keep supporting CARGO_RUSTC_CURRENT_DIR until cargo (including via ./x test cargo) doesn't need it any more. :)

The adjustment looks good to me.

@bors r=albertlarsan68,weihanglo

📌 Commit dd2ac08 has been approved by albertlarsan68,weihanglo

It is now in the queue for this repository.

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

Dec 1, 2024

Finished benchmarking commit (ca4e54f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -0.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results (primary 0.0%, secondary 0.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

Bootstrap: 767.632s -> 768.479s (0.11%)
Artifact size: 332.19 MiB -> 332.12 MiB (-0.02%)

RalfJung added the relnotes

Marks issues that should be documented in the release notes of the next release.

label

Dec 5, 2024

wip-sync pushed a commit to NetBSD/pkgsrc-wip that referenced this pull request

Feb 23, 2025

Pkgsrc changes relative to rust184:

• patch reorganization to deal with new version of upstream vendored crates, checksum updates.

Version 1.85.0 (2025-02-20)

Language

• [The 2024 Edition is now stable.] (rust-lang/rust#133349) See [the edition guide] (https://doc.rust-lang.org/nightly/edition-guide/rust-2024/index.html) for more details.
• [Stabilize async closures] (rust-lang/rust#132706) See [RFC 3668] (https://rust-lang.github.io/rfcs/3668-async-closures.html) for more details.
• [Stabilize #[diagnostic::do_not_recommend]] (rust-lang/rust#132056)
• [Add unpredictable_function_pointer_comparisons lint to warn against function pointer comparisons] (rust-lang/rust#118833)
• [Lint on combining #[no_mangle] and #[export_name] attributes.] (rust-lang/rust#131558)

Compiler

• [The unstable flag -Zpolymorphize has been removed] (rust-lang/rust#133883), see rust-lang/compiler-team#810 for some background.

Platform Support

• [Promote powerpc64le-unknown-linux-musl to tier 2 with host tools] (rust-lang/rust#133801)

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

Libraries

• [Panics in the standard library now have a leading library/ in their path] (rust-lang/rust#132390)

• [std::env::home_dir() on Windows now ignores the non-standard $HOME environment variable] (rust-lang/rust#132515)

  It will be un-deprecated in a subsequent release.

• [Add AsyncFn* to the prelude in all editions.] (rust-lang/rust#132611)

Stabilized APIs

• [BuildHasherDefault::new] (https://doc.rust-lang.org/stable/std/hash/struct.BuildHasherDefault.html#method.new)
• [ptr::fn_addr_eq] (https://doc.rust-lang.org/std/ptr/fn.fn_addr_eq.html)
• [io::ErrorKind::QuotaExceeded] (https://doc.rust-lang.org/stable/std/io/enum.ErrorKind.html#variant.QuotaExceeded)
• [io::ErrorKind::CrossesDevices] (https://doc.rust-lang.org/stable/std/io/enum.ErrorKind.html#variant.CrossesDevices)
• [{float}::midpoint] (https://doc.rust-lang.org/core/primitive.f32.html#method.midpoint)
• [Unsigned {integer}::midpoint] (https://doc.rust-lang.org/std/primitive.u64.html#method.midpoint)
• [NonZeroU*::midpoint] (https://doc.rust-lang.org/std/num/type.NonZeroU32.html#method.midpoint)
• [impl std::iter::Extend for tuples with arity 1 through 12] (https://doc.rust-lang.org/stable/std/iter/trait.Extend.html#impl-Extend%3C(A,)%3E-for-(EA,))
• [FromIterator<(A, ...)> for tuples with arity 1 through 12] (https://doc.rust-lang.org/stable/std/iter/trait.FromIterator.html#impl-FromIterator%3C(EA,)%3E-for-(A,))
• [std::task::Waker::noop] (https://doc.rust-lang.org/stable/std/task/struct.Waker.html#method.noop)

These APIs are now stable in const contexts:

• [mem::size_of_val] (https://doc.rust-lang.org/stable/std/mem/fn.size_of_val.html)
• [mem::align_of_val] (https://doc.rust-lang.org/stable/std/mem/fn.align_of_val.html)
• [Layout::for_value] (https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.for_value)
• [Layout::align_to] (https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.align_to)
• [Layout::pad_to_align] (https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.pad_to_align)
• [Layout::extend] (https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.extend)
• [Layout::array] (https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.array)
• [std::mem::swap] (https://doc.rust-lang.org/stable/std/mem/fn.swap.html)
• [std::ptr::swap] (https://doc.rust-lang.org/stable/std/ptr/fn.swap.html)
• [NonNull::new] (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.new)
• [HashMap::with_hasher] (https://doc.rust-lang.org/stable/std/collections/struct.HashMap.html#method.with_hasher)
• [HashSet::with_hasher] (https://doc.rust-lang.org/stable/std/collections/struct.HashSet.html#method.with_hasher)
• [BuildHasherDefault::new] (https://doc.rust-lang.org/stable/std/hash/struct.BuildHasherDefault.html#method.new)
• [<float>::recip] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.recip)
• [<float>::to_degrees] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.to_degrees)
• [<float>::to_radians] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.to_radians)
• [<float>::max] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.max)
• [<float>::min] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.min)
• [<float>::clamp] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.clamp)
• [<float>::abs] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.abs)
• [<float>::signum] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.signum)
• [<float>::copysign] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.copysign)
• [MaybeUninit::write] (https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.write)

Cargo

• [Add future-incompatibility warning against keywords in cfgs and add raw-idents] (rust-lang/cargo#14671)
• [Stabilize higher precedence trailing flags] (rust-lang/cargo#14900)
• [Pass CARGO_CFG_FEATURE to build scripts] (rust-lang/cargo#14902)

Rustdoc

• [Doc comment on impl blocks shows the first line, even when the impl block is collapsed] (rust-lang/rust#132155)

Compatibility Notes

• [rustc no longer treats the test cfg as a well known check-cfg] (rust-lang/rust#131729), instead it is up to the build systems and users of --check-cfg[^check-cfg] to set it as a well known cfg using --check-cfg=cfg(test).

  This is done to enable build systems like Cargo to set it conditionally, as not all source files are suitable for unit tests.

  [Cargo (for now) unconditionally sets the test cfg as a well known cfg] (rust-lang/cargo#14963). [^check-cfg]: https://doc.rust-lang.org/nightly/rustc/check-cfg.html

• [Disable potentially incorrect type inference if there are trivial and non-trivial where-clauses] (rust-lang/rust#132325)

• std::env::home_dir() has been deprecated for years, because it can give surprising results in some Windows configurations if the HOME environment variable is set (which is not the normal configuration on Windows). We had previously avoided changing its behavior, out of concern for compatibility with code depending on this non-standard configuration. Given how long this function has been deprecated, we're now fixing its behavior as a bugfix. A subsequent release will remove the deprecation for this function.

• [Make core::ffi::c_char signedness more closely match that of the platform-default char] (rust-lang/rust#132975)

  This changed c_char from an i8 to u8 or vice versa on many Tier 2 and 3 targets (mostly Arm and RISC-V embedded targets). The new definition may result in compilation failures but fixes compatibility issues with C.

  The libc crate matches this change as of its 0.2.169 release.

• [When compiling a nested macro_rules macro from an external crate, the content of the inner macro_rules is now built with the edition of the external crate, not the local crate.] (rust-lang/rust#133274)

• [Increase sparcv9-sun-solaris and x86_64-pc-solaris Solaris baseline to 11.4.] (rust-lang/rust#133293)

• [Show abi_unsupported_vector_types lint in future breakage reports] (rust-lang/rust#133374)

• [Error if multiple super-trait instantiations of dyn Trait need associated types to be specified but only one is provided] (rust-lang/rust#133392)

• [Change powerpc64-ibm-aix default codemodel to large] (rust-lang/rust#133811)

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.

• [Build x86_64-unknown-linux-gnu with LTO for C/C++ code (e.g., jemalloc)] (rust-lang/rust#134690)

tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request

Feb 26, 2025

This MR contains the following updates:

MR created with the help of el-capitano/tools/renovate-bot.

Proposed changes to behavior should be submitted there as MRs.

Release Notes

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this MR and you won't be reminded about this update again.

• If you want to rebase/retry this MR, check this box

This MR has been generated by Renovate Bot.

Labels

merged-by-bors

This PR was explicitly merged by bors.

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)