Rollup of 6 pull requests #132018

fmease · 2024-10-22T02:15:25Z

Successful merges:

make unsupported_calling_conventions a hard error #129935 (make unsupported_calling_conventions a hard error)
rust_for_linux: -Zregparm=<N> commandline flag for X86 (#116972) #130432 (rust_for_linux: -Zregparm= commandline flag for X86 (-Zregparm=3 support in rustc #116972))
rt::Argument: elide lifetimes #131697 (rt::Argument: elide lifetimes)
shave 150ms off bootstrap #131954 (shave 150ms off bootstrap)
Represent hir::TraitBoundModifiers as distinct parts in HIR #131982 (Represent hir::TraitBoundModifiers as distinct parts in HIR)
Update triagebot.toml #132017 (Update triagebot.toml)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

)

Update the list of reviewers after updating the team.

Co-authored-by: Jubilee <[email protected]>

this saves about 150ms on many ./x invocations

…ntions, r=compiler-errors make unsupported_calling_conventions a hard error This has been a future-compat lint (not shown in dependencies) since Rust 1.55, released 3 years ago. Hopefully that was enough time so this can be made a hard error now. Given that long timeframe, I think it's justified to skip the "show in dependencies" stage. There were [not many crates hitting this](rust-lang#86231 (comment)) even when the lint was originally added. This should get cratered, and I assume then it needs a t-compiler FCP. (t-compiler because this looks entirely like an implementation oversight -- for the vast majority of ABIs, we already have a hard error, but some were initially missed, and we are finally fixing that.) Fixes rust-lang#87678

…jubilee,pnkfelix rust_for_linux: -Zregparm=<N> commandline flag for X86 (rust-lang#116972) Command line flag `-Zregparm=<N>` for X86 (32-bit) for rust-for-linux: rust-lang#116972 Implemented in the similar way as fastcall/vectorcall support (args are marked InReg if fit).

`rt::Argument`: elide lifetimes `@rustbot` label +C-cleanup

…Kobzol shave 150ms off bootstrap This starts `git` commands inside `GitInfo`and the submodule updates in parallel. Git should already perform internal locking in cases where it needs to serialize a modification. ``` OLD Benchmark #1: ./x check core Time (mean ± σ): 608.7 ms ± 4.4 ms [User: 368.3 ms, System: 455.1 ms] Range (min … max): 602.3 ms … 618.8 ms 10 runs NEW Benchmark #1: ./x check core Time (mean ± σ): 462.8 ms ± 2.6 ms [User: 350.2 ms, System: 485.1 ms] Range (min … max): 457.5 ms … 465.6 ms 10 runs ``` This should help with the rust-analyzer setup which issues many individual `./x check` calls. There's more that could be done but these were the lowest-hanging fruits that I saw.

…modifiers, r=fmease Represent `hir::TraitBoundModifiers` as distinct parts in HIR Stop squashing distinct `polarity` and `constness` into a single `hir::TraitBoundModifier`. This PR doesn't attempt to handle all the corner cases correctly, since the old code certainly did not either; but it should be much easier for, e.g., rustc devs working on diagnostics, or clippy devs, to actually handle constness and polarity correctly.

…=scottmcm Update triagebot.toml Update the list of reviewers after updating the team here: rust-lang/team#1555

fmease · 2024-10-22T02:16:03Z

@bors r+ rollup=never p=5

bors · 2024-10-22T02:16:06Z

📌 Commit ce0d299 has been approved by fmease

It is now in the queue for this repository.

bors · 2024-10-22T02:34:58Z

⌛ Testing commit ce0d299 with merge f3626a3...

Rollup of 6 pull requests Successful merges: - rust-lang#129935 (make unsupported_calling_conventions a hard error) - rust-lang#130432 (rust_for_linux: -Zregparm=<N> commandline flag for X86 (rust-lang#116972)) - rust-lang#131697 (`rt::Argument`: elide lifetimes) - rust-lang#131954 (shave 150ms off bootstrap) - rust-lang#131982 (Represent `hir::TraitBoundModifiers` as distinct parts in HIR) - rust-lang#132017 (Update triagebot.toml) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-10-22T03:22:58Z

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

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


---- [ui] tests/ui/stats/hir-stats.rs stdout ----
diff of stderr:

141 hir-stats Attribute                128 ( 1.4%)             4            32
142 hir-stats GenericArgs              144 ( 1.6%)             3            48
143 hir-stats Variant                  144 ( 1.6%)             2            72
- hir-stats GenericBound             192 ( 2.1%)             4            48
- hir-stats - Trait                    192 ( 2.1%)             4
146 hir-stats WherePredicate           192 ( 2.1%)             3            64
147 hir-stats - BoundPredicate           192 ( 2.1%)             3
+ hir-stats GenericBound             256 ( 2.8%)             4            64
+ hir-stats - Trait                    256 ( 2.8%)             4
148 hir-stats Block                    288 ( 3.2%)             6            48
149 hir-stats GenericParam             360 ( 4.0%)             5            72
150 hir-stats Pat                      360 ( 4.0%)             5            72

155 hir-stats Ty                       720 ( 8.0%)            15            48
156 hir-stats - Ref                       48 ( 0.5%)             1
157 hir-stats - Ptr                       48 ( 0.5%)             1
- hir-stats - Path                     624 ( 7.0%)            13
- hir-stats Expr                     768 ( 8.6%)            12            64
+ hir-stats - Path                     624 ( 6.9%)            13
+ hir-stats Expr                     768 ( 8.5%)            12            64
160 hir-stats - Path                      64 ( 0.7%)             1
161 hir-stats - Match                     64 ( 0.7%)             1
162 hir-stats - Struct                    64 ( 0.7%)             1

163 hir-stats - InlineAsm                 64 ( 0.7%)             1
164 hir-stats - Lit                      128 ( 1.4%)             2
165 hir-stats - Block                    384 ( 4.3%)             6
- hir-stats Item                     968 (10.8%)            11            88
+ hir-stats Item                     968 (10.7%)            11            88
167 hir-stats - Enum                      88 ( 1.0%)             1
168 hir-stats - Trait                     88 ( 1.0%)             1
169 hir-stats - Impl                      88 ( 1.0%)             1

171 hir-stats - ForeignMod                88 ( 1.0%)             1
172 hir-stats - Fn                       176 ( 2.0%)             2
173 hir-stats - Use                      352 ( 3.9%)             4
- hir-stats Path                   1_240 (13.8%)            31            40
- hir-stats PathSegment            1_920 (21.4%)            40            48
+ hir-stats Path                   1_240 (13.7%)            31            40
+ hir-stats PathSegment            1_920 (21.3%)            40            48
176 hir-stats ----------------------------------------------------------------
+ hir-stats Total                  9_024
178 hir-stats
179 

---
To only update this specific test, also pass `--test-args stats/hir-stats.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/stats/hir-stats.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--check-cfg" "cfg(FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/stats/hir-stats" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/stats/hir-stats/auxiliary" "-Zhir-stats"
--- stderr -------------------------------
--- stderr -------------------------------
ast-stats-1 PRE EXPANSION AST STATS
ast-stats-1 Name                Accumulated Size         Count     Item Size
ast-stats-1 ----------------------------------------------------------------
ast-stats-1 Crate                     40 ( 0.6%)             1            40
ast-stats-1 GenericArgs               40 ( 0.6%)             1            40
ast-stats-1 - AngleBracketed            40 ( 0.6%)             1
ast-stats-1 ExprField                 48 ( 0.7%)             1            48
ast-stats-1 WherePredicate            56 ( 0.8%)             1            56
ast-stats-1 - BoundPredicate            56 ( 0.8%)             1
ast-stats-1 Attribute                 64 ( 1.0%)             2            32
ast-stats-1 - DocComment                32 ( 0.5%)             1
ast-stats-1 - Normal                    32 ( 0.5%)             1
ast-stats-1 Local                     80 ( 1.2%)             1            80
ast-stats-1 ForeignItem               88 ( 1.3%)             1            88
ast-stats-1 - Fn                        88 ( 1.3%)             1
ast-stats-1 Arm                       96 ( 1.4%)             2            48
ast-stats-1 FnDecl                   120 ( 1.8%)             5            24
ast-stats-1 FieldDef                 160 ( 2.4%)             2            80
ast-stats-1 Param                    160 ( 2.4%)             4            40
ast-stats-1 Stmt                     160 ( 2.4%)             5            32
ast-stats-1 - Let                       32 ( 0.5%)             1
ast-stats-1 - MacCall                   32 ( 0.5%)             1
ast-stats-1 - Expr                      96 ( 1.4%)             3
ast-stats-1 Block                    192 ( 2.9%)             6            32
ast-stats-1 Variant                  208 ( 3.1%)             2           104
ast-stats-1 AssocItem                352 ( 5.3%)             4            88
ast-stats-1 - Type                     176 ( 2.7%)             2
ast-stats-1 - Fn                       176 ( 2.7%)             2
ast-stats-1 GenericBound             352 ( 5.3%)             4            88
ast-stats-1 - Trait                    352 ( 5.3%)             4
ast-stats-1 GenericParam             480 ( 7.2%)             5            96
ast-stats-1 Pat                      504 ( 7.6%)             7            72
ast-stats-1 - Struct                    72 ( 1.1%)             1
ast-stats-1 - Wild                      72 ( 1.1%)             1
ast-stats-1 - Ident                    360 ( 5.4%)             5
ast-stats-1 Expr                     576 ( 8.7%)             8            72
ast-stats-1 - Path                      72 ( 1.1%)             1
ast-stats-1 - Match                     72 ( 1.1%)             1
ast-stats-1 - Struct                    72 ( 1.1%)             1
ast-stats-1 - Lit                      144 ( 2.2%)             2
ast-stats-1 - Block                    216 ( 3.3%)             3
ast-stats-1 PathSegment              744 (11.2%)            31            24
ast-stats-1 Ty                       896 (13.5%)            14            64
ast-stats-1 - Ref                       64 ( 1.0%)             1
ast-stats-1 - Ptr                       64 ( 1.0%)             1
ast-stats-1 - ImplicitSelf             128 ( 1.9%)             2
ast-stats-1 - Path                     640 ( 9.6%)            10
ast-stats-1 Item                   1_224 (18.4%)             9           136
ast-stats-1 - ForeignMod               136 ( 2.0%)             1
ast-stats-1 - Trait                    136 ( 2.0%)             1
ast-stats-1 - Impl                     136 ( 2.0%)             1
ast-stats-1 - Enum                     136 ( 2.0%)             1
ast-stats-1 - Fn                       272 ( 4.1%)             2
ast-stats-1 - Use                      408 ( 6.1%)             3
ast-stats-1 ----------------------------------------------------------------
ast-stats-1 Total                  6_640
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 Crate                     40 ( 0.5%)             1            40
ast-stats-2 GenericArgs               40 ( 0.5%)             1            40
ast-stats-2 - AngleBracketed            40 ( 0.5%)             1
ast-stats-2 ExprField                 48 ( 0.7%)             1            48
ast-stats-2 WherePredicate            56 ( 0.8%)             1            56
ast-stats-2 - BoundPredicate            56 ( 0.8%)             1
ast-stats-2 Local                     80 ( 1.1%)             1            80
ast-stats-2 ForeignItem               88 ( 1.2%)             1            88
ast-stats-2 - Fn                        88 ( 1.2%)             1
ast-stats-2 Arm                       96 ( 1.3%)             2            48
ast-stats-2 FnDecl                   120 ( 1.6%)             5            24
ast-stats-2 InlineAsm                120 ( 1.6%)             1           120
ast-stats-2 Attribute                128 ( 1.8%)             4            32
ast-stats-2 - DocComment                32 ( 0.4%)             1
ast-stats-2 - Normal                    96 ( 1.3%)             3
ast-stats-2 FieldDef                 160 ( 2.2%)             2            80
ast-stats-2 Param                    160 ( 2.2%)             4            40
ast-stats-2 Stmt                     160 ( 2.2%)             5            32
ast-stats-2 - Let                       32 ( 0.4%)             1
ast-stats-2 - Semi                      32 ( 0.4%)             1
ast-stats-2 - Expr                      96 ( 1.3%)             3
ast-stats-2 Block                    192 ( 2.6%)             6            32
ast-stats-2 Variant                  208 ( 2.9%)             2           104
ast-stats-2 AssocItem                352 ( 4.8%)             4            88
ast-stats-2 - Type                     176 ( 2.4%)             2
ast-stats-2 - Fn                       176 ( 2.4%)             2
ast-stats-2 GenericBound             352 ( 4.8%)             4            88
ast-stats-2 - Trait                    352 ( 4.8%)             4
ast-stats-2 GenericParam             480 ( 6.6%)             5            96
ast-stats-2 Pat                      504 ( 6.9%)             7            72
ast-stats-2 - Struct                    72 ( 1.0%)             1
ast-stats-2 - Wild                      72 ( 1.0%)             1
ast-stats-2 - Ident                    360 ( 4.9%)             5
ast-stats-2 Expr                     648 ( 8.9%)             9            72
ast-stats-2 - Path                      72 ( 1.0%)             1
ast-stats-2 - Match                     72 ( 1.0%)             1
ast-stats-2 - Struct                    72 ( 1.0%)             1
ast-stats-2 - InlineAsm                 72 ( 1.0%)             1
ast-stats-2 - Lit                      144 ( 2.0%)             2
ast-stats-2 - Block                    216 ( 3.0%)             3
ast-stats-2 PathSegment              864 (11.9%)            36            24
ast-stats-2 Ty                       896 (12.3%)            14            64
ast-stats-2 - Ref                       64 ( 0.9%)             1
ast-stats-2 - Ptr                       64 ( 0.9%)             1
ast-stats-2 - ImplicitSelf             128 ( 1.8%)             2
ast-stats-2 - Path                     640 ( 8.8%)            10
ast-stats-2 Item                   1_496 (20.5%)            11           136
ast-stats-2 - Enum                     136 ( 1.9%)             1
ast-stats-2 - Trait                    136 ( 1.9%)             1
ast-stats-2 - Impl                     136 ( 1.9%)             1
ast-stats-2 - ExternCrate              136 ( 1.9%)             1
ast-stats-2 - ForeignMod               136 ( 1.9%)             1
ast-stats-2 - Fn                       272 ( 3.7%)             2
ast-stats-2 - Use                      544 ( 7.5%)             4
ast-stats-2 ----------------------------------------------------------------
ast-stats-2 Total                  7_288
hir-stats HIR STATS
hir-stats Name                Accumulated Size         Count     Item Size
hir-stats ----------------------------------------------------------------
hir-stats ----------------------------------------------------------------
hir-stats ForeignItemRef            24 ( 0.3%)             1            24
hir-stats Lifetime                  24 ( 0.3%)             1            24
hir-stats Mod                       32 ( 0.4%)             1            32
hir-stats ExprField                 40 ( 0.4%)             1            40
hir-stats TraitItemRef              56 ( 0.6%)             2            28
hir-stats GenericArg                64 ( 0.7%)             4            16
hir-stats - Type                      16 ( 0.2%)             1
hir-stats - Lifetime                  48 ( 0.5%)             3
hir-stats Local                     64 ( 0.7%)             1            64
hir-stats Param                     64 ( 0.7%)             2            32
hir-stats Body                      72 ( 0.8%)             3            24
hir-stats ImplItemRef               72 ( 0.8%)             2            36
hir-stats InlineAsm                 72 ( 0.8%)             1            72
hir-stats Arm                       80 ( 0.9%)             2            40
hir-stats FieldDef                  96 ( 1.1%)             2            48
hir-stats Stmt                      96 ( 1.1%)             3            32
hir-stats - Let                       32 ( 0.4%)             1
hir-stats - Semi                      32 ( 0.4%)             1
hir-stats - Expr                      32 ( 0.4%)             1
hir-stats FnDecl                   120 ( 1.3%)             3            40
hir-stats Attribute                128 ( 1.4%)             4            32
hir-stats GenericArgs              144 ( 1.6%)             3            48
hir-stats Variant                  144 ( 1.6%)             2            72
hir-stats WherePredicate           192 ( 2.1%)             3            64
hir-stats - BoundPredicate           192 ( 2.1%)             3
hir-stats GenericBound             256 ( 2.8%)             4            64
hir-stats - Trait                    256 ( 2.8%)             4
hir-stats Block                    288 ( 3.2%)             6            48
hir-stats GenericParam             360 ( 4.0%)             5            72
hir-stats Pat                      360 ( 4.0%)             5            72
hir-stats - Struct                    72 ( 0.8%)             1
hir-stats - Wild                      72 ( 0.8%)             1
hir-stats - Binding                  216 ( 2.4%)             3
hir-stats Generics                 560 ( 6.2%)            10            56
hir-stats Ty                       720 ( 8.0%)            15            48
hir-stats - Ref                       48 ( 0.5%)             1
hir-stats - Ptr                       48 ( 0.5%)             1
hir-stats - Path                     624 ( 6.9%)            13
hir-stats Expr                     768 ( 8.5%)            12            64
hir-stats - Path                      64 ( 0.7%)             1
hir-stats - Match                     64 ( 0.7%)             1
hir-stats - Struct                    64 ( 0.7%)             1
hir-stats - InlineAsm                 64 ( 0.7%)             1
hir-stats - Lit                      128 ( 1.4%)             2
hir-stats - Block                    384 ( 4.3%)             6
hir-stats Item                     968 (10.7%)            11            88
hir-stats - Enum                      88 ( 1.0%)             1
hir-stats - Trait                     88 ( 1.0%)             1
hir-stats - Impl                      88 ( 1.0%)             1
hir-stats - ExternCrate               88 ( 1.0%)             1
hir-stats - ForeignMod                88 ( 1.0%)             1
hir-stats - Fn                       176 ( 2.0%)             2
hir-stats - Use                      352 ( 3.9%)             4
hir-stats Path                   1_240 (13.7%)            31            40
hir-stats PathSegment            1_920 (21.3%)            40            48
hir-stats ----------------------------------------------------------------
hir-stats
------------------------------------------

bors · 2024-10-22T03:23:35Z

💔 Test failed - checks-actions

ShE3py and others added 15 commits October 14, 2024 20:24

rt::Argument: elide lifetimes

1364631

rust_for_linux: -Zregparm=<N> commandline flag for X86 (rust-lang#116972

b3ae64d

)

Update triagebot.toml

67081db

Update the list of reviewers after updating the team.

compiler: Enable test for regparm on different hosts

d6f5b43

compiler: Revert -Zregparm handling for extern Rust

b9c9678

Limited -Zregparm support (no Rust calling conv) descriptions

37dc4ec

Co-authored-by: Jubilee <[email protected]>

run git commands in bootstrap in parallel

a269e4d

this saves about 150ms on many ./x invocations

make unsupported_calling_conventions a hard error

de3cbf3

Represent TraitBoundModifiers as distinct parts in HIR

b6e4fca

Rollup merge of rust-lang#131697 - ShE3py:rt-arg-lifetimes, r=Amanieu

a6878b0

`rt::Argument`: elide lifetimes `@rustbot` label +C-cleanup

Rollup merge of rust-lang#132017 - celinval:smir-update-reviewerss, r…

ce0d299

…=scottmcm Update triagebot.toml Update the list of reviewers after updating the team here: rust-lang/team#1555

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 Oct 22, 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 Oct 22, 2024

workingjubilee mentioned this pull request Oct 22, 2024

Represent hir::TraitBoundModifiers as distinct parts in HIR #131982

Merged

fmease closed this Oct 22, 2024

fmease deleted the rollup-0sbaxce branch October 22, 2024 03:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #132018

Rollup of 6 pull requests #132018

Uh oh!

fmease commented Oct 22, 2024

Uh oh!

fmease commented Oct 22, 2024

Uh oh!

bors commented Oct 22, 2024

Uh oh!

bors commented Oct 22, 2024

Uh oh!

rust-log-analyzer commented Oct 22, 2024

Uh oh!

bors commented Oct 22, 2024

Uh oh!

Uh oh!

Rollup of 6 pull requests #132018

Rollup of 6 pull requests #132018

Uh oh!

Conversation

fmease commented Oct 22, 2024

Uh oh!

fmease commented Oct 22, 2024

Uh oh!

bors commented Oct 22, 2024

Uh oh!

bors commented Oct 22, 2024

Uh oh!

rust-log-analyzer commented Oct 22, 2024

Uh oh!

bors commented Oct 22, 2024

Uh oh!

Uh oh!