Use better heuristic for printing Cargo specific diagnostics by Urgau · Pull Request #121237 · 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

Conversation5 Commits1 Checks0 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 }})

It was reported in the check-cfg call for testing that the Rust for Linux project is setting the CARGO env without compiling with it, which is an issue since we are using the CARGO env as a proxy for "was launched from Cargo".

This PR switch to the CARGO_CRATE_NAME Cargo env, which shouldn't collide (as much) with other build systems. I also took the opportunity to consolidate all the checks under the same function.

r? @estebank

rustbot has assigned @estebank.
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-compiler

Relevant to the compiler team, which will review and decide on the PR/issue.

labels

Feb 17, 2024

It was reported in the check-cfg call for testing that the Rust for Linux project is setting the CARGO env without compiling with it, which is an issue since we are using the CARGO env as a proxy for "was launched from Cargo".

Why is it setting CARGO if it isn't using cargo?

Why is it setting CARGO if it isn't using cargo?

From @ojeda in #82450 (comment):

Ah, I see; yeah, we use the variable to point to the Cargo binary (like we do for other compilers/tools).

[..] we set things like RUSTC, RUSTDOC, RUSTFMT, RUSTFLAGS... [..]; it is just that the kernel Makefile sets early on variables for the programs, e.g. CC, PYTHON3 etc., and since we currently use Cargo somewhere for unrelated reasons, we had CARGO too.

I like this a lot. And after all, it's also just a heuristic.

r? compiler-errors @bors r+ rollup

📌 Commit d988d8f has been approved by compiler-errors

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

Feb 17, 2024

ojeda mentioned this pull request

Feb 17, 2024

95 tasks

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request

Feb 17, 2024

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

Feb 17, 2024

…llaumeGomez

Rollup of 7 pull requests

Successful merges:

rust-lang#118264 (Optimize VecDeque::drain for (half-)open ranges)
rust-lang#121079 (distribute tool documentations and avoid file conflicts on x install)
rust-lang#121100 (Detect when method call on argument could be removed to fulfill failed trait bound)
rust-lang#121160 (rustdoc: fix and refactor HTML rendering a bit)
rust-lang#121198 (Add more checks for unnamed_fields during HIR analysis)
rust-lang#121221 (AstConv: Refactor lowering of associated item bindings a bit)
rust-lang#121237 (Use better heuristic for printing Cargo specific diagnostics)

r? @ghost @rustbot modify labels: rollup

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

Feb 18, 2024

Rollup of 7 pull requests

Successful merges:

rust-lang#120526 (rustdoc: Correctly handle long crate names on mobile)
rust-lang#121100 (Detect when method call on argument could be removed to fulfill failed trait bound)
rust-lang#121160 (rustdoc: fix and refactor HTML rendering a bit)
rust-lang#121198 (Add more checks for unnamed_fields during HIR analysis)
rust-lang#121218 (Fix missing trait impls for type in rustc docs)
rust-lang#121221 (AstConv: Refactor lowering of associated item bindings a bit)
rust-lang#121237 (Use better heuristic for printing Cargo specific diagnostics)

r? @ghost @rustbot modify labels: rollup

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

Feb 18, 2024

Urgau deleted the better-cargo-heuristic branch

February 18, 2024 09:51

ojeda added a commit to ojeda/linux that referenced this pull request

Apr 1, 2024

This is the next upgrade to the Rust toolchain, from 1.77.1 to 1.78.0 (i.e. the latest) [1].

See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4 ("rust: upgrade to Rust 1.68.2").

Unstable features

There have been no changes to the set of unstable features used in our own code. Therefore, the only unstable features allowed to be used outside the kernel crate is still new_uninit.

However, since we are finally dropping our alloc fork [3], all the unstable features used by alloc (~30 language ones, ~60 library ones) are not a concern anymore. This reduces the maintanance burden, increases the chances of new compiler versions working without changes and gets us closer to the goal of supporting several compiler versions.

It also means that, ignoring non-language/library features, we are currently left with just the few language features needed to implement the kernel Arc, the new_uninit library feature, the compiler_builtins marker and the few no_* cfgs we pass when compiling core/alloc.

Please see [4] for details.

Required changes

LLVM's data layout

Rust 1.77.0 (i.e. the previous upgrade) introduced a check for matching LLVM data layouts [5]. Then, Rust 1.78.0 upgraded LLVM's bundled major version from 17 to 18 [6], which changed the data layout in x86 [7]. Thus update the data layout in our custom target specification for x86 so that the compiler does not complain about the mismatch:

error: data-layout for target `target-5559158138856098584`,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128`,
differs from LLVM target's `x86_64-linux-gnu` default layout,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128`

In the future, the goal is to drop the custom target specification files. Meanwhile, if we want to support other LLVM versions used in rustc (e.g. for LTO), we will need to add some extra logic (e.g. conditional on LLVM's version, or extracting the data layout from an existing built-in target specification).

`unused_imports`

Rust's unused_imports lint covers both unused and redudant imports. Now, in 1.78.0, the lint detects more cases of redundant imports [8]. Thus the previous commit cleaned them up.

Clippy's `new_without_default`

Clippy now suggests to implement Default even when new() is const, since Default::default() may call const functions even if it is not const itself [9]. Thus the previous commit added the implementation.

Other changes in Rust

Rust 1.78.0 introduces feature(asm_goto) [10] [11]. This feature was discussed in the past [12].

Rust 1.78.0 introduced support for mutable pointers to Rust statics, including a test case for the Linux kernel's VTABLE use case [13].

Rust 1.78.0 with debug assertions enabled (i.e. -Cdebug-assertions=y, kernel's CONFIG_RUST_DEBUG_ASSERTIONS=y) will now always check all unsafe preconditions, without a way to opt-out for particular cases [14].

Rust 1.78.0 also improved a couple issues we reported when giving feedback for the new --check-cfg feature [15] [16].

`alloc` upgrade and reviewing

As mentioned above, compiler upgrades will not update alloc anymore, since we are dropping our alloc fork [3].

As a bonus, even if that series is not applied, the new compiler release happens to build cleanly the existing alloc too (i.e. the previous version's).

ojeda added a commit to ojeda/linux that referenced this pull request

Apr 1, 2024

This is the next upgrade to the Rust toolchain, from 1.77.1 to 1.78.0 (i.e. the latest) [1].

See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4 ("rust: upgrade to Rust 1.68.2").

Unstable features

There have been no changes to the set of unstable features used in our own code. Therefore, the only unstable features allowed to be used outside the kernel crate is still new_uninit.

However, since we are finally dropping our alloc fork [3], all the unstable features used by alloc (~30 language ones, ~60 library ones) are not a concern anymore. This reduces the maintenance burden, increases the chances of new compiler versions working without changes and gets us closer to the goal of supporting several compiler versions.

Please see [4] for details.

Required changes

LLVM's data layout

error: data-layout for target `target-5559158138856098584`,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128`,
differs from LLVM target's `x86_64-linux-gnu` default layout,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128`

`unused_imports`

Rust's unused_imports lint covers both unused and redundant imports. Now, in 1.78.0, the lint detects more cases of redundant imports [8]. Thus one of the previous patches cleaned them up.

Clippy's `new_without_default`

Clippy now suggests to implement Default even when new() is const, since Default::default() may call const functions even if it is not const itself [9]. Thus one of the previous patches implemented it.

Other changes in Rust

Rust 1.78.0 introduced feature(asm_goto) [10] [11]. This feature was discussed in the past [12].

Rust 1.78.0 introduced support for mutable pointers to Rust statics, including a test case for the Linux kernel's VTABLE use case [13].

Rust 1.78.0 with debug assertions enabled (i.e. -Cdebug-assertions=y, kernel's CONFIG_RUST_DEBUG_ASSERTIONS=y) now always checks all unsafe preconditions, without a way to opt-out for particular cases [14].

Rust 1.78.0 also improved a couple issues we reported when giving feedback for the new --check-cfg feature [15] [16].

`alloc` upgrade and reviewing

As mentioned above, compiler upgrades will not update alloc anymore, since we are dropping our alloc fork [3].

ojeda added a commit to ojeda/linux that referenced this pull request

Apr 1, 2024

This is the next upgrade to the Rust toolchain, from 1.77.1 to 1.78.0 (i.e. the latest) [1].

See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4 ("rust: upgrade to Rust 1.68.2").

Unstable features

There have been no changes to the set of unstable features used in our own code. Therefore, the only unstable features allowed to be used outside the kernel crate is still new_uninit.

However, since we are finally dropping our alloc fork [3], all the unstable features used by alloc (~30 language ones, ~60 library ones) are not a concern anymore. This reduces the maintenance burden, increases the chances of new compiler versions working without changes and gets us closer to the goal of supporting several compiler versions.

Please see [4] for details.

Required changes

LLVM's data layout

error: data-layout for target `target-5559158138856098584`,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128`,
differs from LLVM target's `x86_64-linux-gnu` default layout,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128`

In the future, the goal is to drop the custom target specifications. Meanwhile, if we want to support other LLVM versions used in rustc (e.g. for LTO), we will need to add some extra logic (e.g. conditional on LLVM's version, or extracting the data layout from an existing built-in target specification).

`unused_imports`

Rust's unused_imports lint covers both unused and redundant imports. Now, in 1.78.0, the lint detects more cases of redundant imports [8]. Thus one of the previous patches cleaned them up.

Clippy's `new_without_default`

Other changes in Rust

Rust 1.78.0 introduced feature(asm_goto) [10] [11]. This feature was discussed in the past [12].

Rust 1.78.0 introduced support for mutable pointers to Rust statics, including a test case for the Linux kernel's VTABLE use case [13].

Rust 1.78.0 also improved a couple issues we reported when giving feedback for the new --check-cfg feature [15] [16].

`alloc` upgrade and reviewing

As mentioned above, compiler upgrades will not update alloc anymore, since we are dropping our alloc fork [3].

ojeda added a commit to ojeda/linux that referenced this pull request

May 5, 2024

This is the next upgrade to the Rust toolchain, from 1.77.1 to 1.78.0 (i.e. the latest) [1].

See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4 ("rust: upgrade to Rust 1.68.2").

It is much smaller than previous upgrades, since the alloc fork was dropped in commit 9d0441b ("rust: alloc: remove our fork of the alloc crate") [3].

Unstable features

There have been no changes to the set of unstable features used in our own code. Therefore, the only unstable features allowed to be used outside the kernel crate is still new_uninit.

However, since we finally dropped our alloc fork [3], all the unstable features used by alloc (~30 language ones, ~60 library ones) are not a concern anymore. This reduces the maintenance burden, increases the chances of new compiler versions working without changes and gets us closer to the goal of supporting several compiler versions.

Please see [4] for details.

Required changes

LLVM's data layout

error: data-layout for target `target-5559158138856098584`,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128`,
differs from LLVM target's `x86_64-linux-gnu` default layout,
`e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128`

`unused_imports`

Rust's unused_imports lint covers both unused and redundant imports. Now, in 1.78.0, the lint detects more cases of redundant imports [8]. Thus one of the previous patches cleaned them up.

Clippy's `new_without_default`

Other changes in Rust

Rust 1.78.0 introduced feature(asm_goto) [10] [11]. This feature was discussed in the past [12].

Rust 1.78.0 introduced feature(const_refs_to_static) [13] to allow referencing statics in constants and extended feature(const_mut_refs) to allow raw mutable pointers in constants. Together, this should cover the kernel's VTABLE use case. In fact, the implementation [14] in upstream Rust added a test case for it [15].

Rust 1.78.0 with debug assertions enabled (i.e. -Cdebug-assertions=y, kernel's CONFIG_RUST_DEBUG_ASSERTIONS=y) now always checks all unsafe preconditions, though without a way to opt-out for particular cases [16]. It would be ideal to have a way to selectively disable certain checks per-call site for this one (i.e. not just per check but for particular instances of a check), even if the vast majority of the checks remain in place [17].

Rust 1.78.0 also improved a couple issues we reported when giving feedback for the new --check-cfg feature [18] [19].

`alloc` upgrade and reviewing

As mentioned above, compiler upgrades will not update alloc anymore, since we dropped our alloc fork [3].

Labels

S-waiting-on-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

T-compiler

Relevant to the compiler team, which will review and decide on the PR/issue.

Use better heuristic for printing Cargo specific diagnostics by Urgau · Pull Request #121237 · rust-lang/rust (original) (raw)

Conversation

Unstable features

Required changes

LLVM's data layout

unused_imports

Clippy's new_without_default

Other changes in Rust

alloc upgrade and reviewing

Unstable features

Required changes

LLVM's data layout

unused_imports

Clippy's new_without_default

Other changes in Rust

alloc upgrade and reviewing

Unstable features

Required changes

LLVM's data layout

unused_imports

Clippy's new_without_default

Other changes in Rust

alloc upgrade and reviewing

Unstable features

Required changes

LLVM's data layout

unused_imports

Clippy's new_without_default

Other changes in Rust

alloc upgrade and reviewing

`unused_imports`

Clippy's `new_without_default`

`alloc` upgrade and reviewing

`unused_imports`

Clippy's `new_without_default`

`alloc` upgrade and reviewing

`unused_imports`

Clippy's `new_without_default`

`alloc` upgrade and reviewing

`unused_imports`

Clippy's `new_without_default`

`alloc` upgrade and reviewing