Rollup of 4 pull requests #133205

matthiaskrgr · 2024-11-19T08:19:22Z

Successful merges:

Use ConstArgKind::Path for all single-segment paths, not just params under min_generic_const_args #131081 (Use ConstArgKind::Path for all single-segment paths, not just params under min_generic_const_args)
Report the unexpected_cfgs lint in external macros #132577 (Report the unexpected_cfgs lint in external macros)
Merge -Zhir-stats into -Zinput-stats #133023 (Merge -Zhir-stats into -Zinput-stats)
ignore an occasionally-failing test in Miri #133200 (ignore an occasionally-failing test in Miri)

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: Boxy UwU <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]>

Use `ConstArgKind::Path` for all single-segment paths, not just params under `min_generic_const_args` r? `@BoxyUwU` edit by `@BoxyUwU:` This PR introduces a `min_generic_const_args` feature gate and implements some preliminary work for it, representing all const arguments that are single segment paths as `ConstArg::Path` instead of only those that resolve to a const generic parameter. There are a few bits of follow up work after this lands: - Figure out how to represent `Foo<{ STATIC }>` - Figure out how to evaluate `Foo<{ EnumVariantConstructor }>` - Make param env normalization handle non-anon-consts - Move `try_from_lit` and `from_anon_const` to hir ty lowering too

…o, r=petrochenkov Report the `unexpected_cfgs` lint in external macros This PR marks the `unexpected_cfgs` lint as being reportable in external macros, as it's probably not the intention of the macro author to leave ineffective cfgs in the users code. Fixes rust-lang#132572 try-job: aarch64-gnu-debug

…nnethercote Merge `-Zhir-stats` into `-Zinput-stats` Currently `-Z hir-stats` prints the size and count of various kinds of nodes, and the total size of all the nodes it counted, but not the total count of nodes. So, before this PR: ``` $ git clone https://github.com/BurntSushi/ripgrep $ cd ripgrep $ cargo +nightly rustc -- -Z hir-stats ast-stats-1 PRE EXPANSION AST STATS ast-stats-1 Name Accumulated Size Count Item Size ast-stats-1 ---------------------------------------------------------------- ast-stats-1 ... ast-stats-1 ---------------------------------------------------------------- ast-stats-1 Total 93_576 ast-stats-1 ast-stats-2 POST EXPANSION AST STATS ast-stats-2 Name Accumulated Size Count Item Size ast-stats-2 ---------------------------------------------------------------- ast-stats-2 ... ast-stats-2 ---------------------------------------------------------------- ast-stats-2 Total 2_430_648 ast-stats-2 hir-stats HIR STATS hir-stats Name Accumulated Size Count Item Size hir-stats ---------------------------------------------------------------- hir-stats ... hir-stats ---------------------------------------------------------------- hir-stats Total 3_678_512 hir-stats ``` For consistency, this PR adds a total for the count as well: ``` $ cargo +stage1 rustc -- -Z hir-stats ast-stats-1 PRE EXPANSION AST STATS ast-stats-1 Name Accumulated Size Count Item Size ast-stats-1 ---------------------------------------------------------------- ast-stats-1 ... ast-stats-1 ---------------------------------------------------------------- ast-stats-1 Total 93_576 1_877 ast-stats-1 ast-stats-2 POST EXPANSION AST STATS ast-stats-2 Name Accumulated Size Count Item Size ast-stats-2 ---------------------------------------------------------------- ast-stats-2 ... ast-stats-2 ---------------------------------------------------------------- ast-stats-2 Total 2_430_648 48_625 ast-stats-2 hir-stats HIR STATS hir-stats Name Accumulated Size Count Item Size hir-stats ---------------------------------------------------------------- hir-stats ... hir-stats ---------------------------------------------------------------- hir-stats Total 3_678_512 73_418 hir-stats ``` I wasn't sure if I was supposed to update `tests/ui/stats/hir-stats.stderr` to reflect this. I ran it locally, thinking it would fail, but it didn't: ``` $ ./x test tests/ui/stats ... running 2 tests i. test result: ok. 1 passed; 0 failed; 1 ignored; 0 measured; 17949 filtered out ``` Also: is there a reason `-Z hir-stats` and `-Z input-stats` both exist? The former seems like it should completely supercede the latter. But strangely, the two give very different numbers for node counts: ``` $ cargo +nightly rustc -- -Z input-stats ... Lines of code: 483 Pre-expansion node count: 2386 Post-expansion node count: 63844 ``` That's a 30% difference in this case. Is it intentional that these numbers are so different? I see comments for both saying that they are merely approximations and should not be expected to be correct: https://github.com/rust-lang/rust/blob/bd0826a4521a845f36cce1b00e1dd2918ba09e90/compiler/rustc_ast_passes/src/node_count.rs#L1 https://github.com/rust-lang/rust/blob/bd0826a4521a845f36cce1b00e1dd2918ba09e90/compiler/rustc_passes/src/hir_stats.rs#L1-L3

ignore an occasionally-failing test in Miri This is like rust-lang#128640, the test [sometimes](rust-lang#133189) fails due to rust-lang#121950.

matthiaskrgr · 2024-11-19T08:32:38Z

@bors r+ rollup=never p=4

bors · 2024-11-19T08:32:42Z

📌 Commit 9aac15d has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-11-19T11:41:19Z

⌛ Testing commit 9aac15d with merge be7ec27...

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#131081 (Use `ConstArgKind::Path` for all single-segment paths, not just params under `min_generic_const_args`) - rust-lang#132577 (Report the `unexpected_cfgs` lint in external macros) - rust-lang#133023 (Merge `-Zhir-stats` into `-Zinput-stats`) - rust-lang#133200 (ignore an occasionally-failing test in Miri) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-11-19T13:21:23Z

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

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

   |
18 | #[derive(Debug, Default, Deserialize)]
   |                          ^^^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: `#[warn(unexpected_cfgs)]` on by default
   = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)


warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> C:\a\rust\rust\build\ct\tokei\target\debug\build\tokei-93faf8bcc0fffe96\out/language_type.rs:5:10
  |
5 | #[derive(Deserialize, Serialize)]
  |          ^^^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> C:\a\rust\rust\build\ct\tokei\target\debug\build\tokei-93faf8bcc0fffe96\out/language_type.rs:5:23
  |
5 | #[derive(Deserialize, Serialize)]
  |                       ^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning]  --> src\language\languages.rs:20:26
   |
20 | #[derive(Debug, Default, Serialize)]
   |                          ^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning]  --> src\language\mod.rs:15:24
   |
15 | #[derive(Clone, Debug, Deserialize, Default, PartialEq, Serialize)]
   |                        ^^^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning]  --> src\language\mod.rs:15:57
   |
15 | #[derive(Clone, Debug, Deserialize, Default, PartialEq, Serialize)]
   |                                                         ^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> src\stats.rs:4:10
  |
4 | #[derive(Deserialize, Serialize, Clone, Debug, PartialEq)]
  |          ^^^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> src\stats.rs:4:23
  |
4 | #[derive(Deserialize, Serialize, Clone, Debug, PartialEq)]
  |                       ^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: non-local `impl` definition, `impl` blocks should be written at the same level as their item
---
[RUSTC-TIMING] miri test:false 5.819
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Tue, Nov 19, 2024  1:21:07 PM
  network time: Tue, 19 Nov 2024 13:21:07 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

bors · 2024-11-19T13:22:01Z

💔 Test failed - checks-actions

jieyouxu · 2024-11-19T13:37:45Z

@bors retry (msvc)

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#131081 (Use `ConstArgKind::Path` for all single-segment paths, not just params under `min_generic_const_args`) - rust-lang#132577 (Report the `unexpected_cfgs` lint in external macros) - rust-lang#133023 (Merge `-Zhir-stats` into `-Zinput-stats`) - rust-lang#133200 (ignore an occasionally-failing test in Miri) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-11-19T16:32:03Z

⌛ Testing commit 9aac15d with merge 7899368...

samestep and others added 13 commits November 15, 2024 12:46

Print total node count in -Z hir-stats

12eaa3a

Merge -Zhir-stats into -Zinput-stats

090c24f

Report unexpected_cfgs lint in external macros

cc48194

Update anstream to 0.6.18 to fix a check-cfg issue

e8bd643

Bump stdarch to the latest master

58664de

Update xshell and xshell-macros to v0.2.7

79c8e64

Introduce min_generic_const_args and directly represent paths

59e339f

Co-authored-by: Boxy UwU <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]>

Fix broken intra-doc link

473b5d5

ignore an occasionally-failing test in Miri

7931a8d

Rollup merge of rust-lang#133200 - RalfJung:miri-rwlock-test, r=tgross35

9aac15d

ignore an occasionally-failing test in Miri This is like rust-lang#128640, the test [sometimes](rust-lang#133189) fails due to rust-lang#121950.

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 Nov 19, 2024

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 Nov 19, 2024

jieyouxu added the CI-spurious-fail-msvc CI spurious failure: target env msvc label Nov 19, 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-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #133205

Rollup of 4 pull requests #133205

matthiaskrgr commented Nov 19, 2024

matthiaskrgr commented Nov 19, 2024

bors commented Nov 19, 2024

bors commented Nov 19, 2024

rust-log-analyzer commented Nov 19, 2024

bors commented Nov 19, 2024

jieyouxu commented Nov 19, 2024

bors commented Nov 19, 2024

Rollup of 4 pull requests #133205

Are you sure you want to change the base?

Rollup of 4 pull requests #133205

Conversation

matthiaskrgr commented Nov 19, 2024

matthiaskrgr commented Nov 19, 2024

bors commented Nov 19, 2024

bors commented Nov 19, 2024

rust-log-analyzer commented Nov 19, 2024

bors commented Nov 19, 2024

jieyouxu commented Nov 19, 2024

bors commented Nov 19, 2024