Skip to content

Conversation

jieyouxu
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mati865 and others added 11 commits April 21, 2024 20:15
Upcoming mingw-w64 releases will contain small math functions refactor which moved implementation around.
As a result functions like `lgamma`
now depend on libraries in this order:
`libmingwex.a` -> `libmsvcrt.a` -> `libmingwex.a`.

Fixes rust-lang#124221
Co-authored-by: jyn <[email protected]>
…ingw-w64, r=petrochenkov

Add `-lmingwex` second time in `mingw_libs`

Upcoming mingw-w64 releases will contain small math functions refactor which moved implementation around. As a result functions like `lgamma`
now depend on libraries in this order:
`libmingwex.a` -> `libmsvcrt.a` -> `libmingwex.a`.

Fixes rust-lang#124221
ignore generics args in attribute paths

Fixes rust-lang#97006
Fixes rust-lang#123911
Fixes rust-lang#123912

This patch ensures that we no longer have to handle invalid generic arguments in attribute paths.

r? `@petrochenkov`
bootstrap: add comments for the automatic dry run
reachable computation: extend explanation of what this does, and why

Follow-up to rust-lang#122769. I had the time to think about this some more, in particular in the context of rust-lang#119214, so I felt it was worth extending these comments some more.

I also gave up on the context of "externally reachable" as it is not called that way anywhere else in the compiler.

Cc `@tmiasko` `@saethlin`
…rochenkov

Make sure we consume a generic arg when checking mistyped turbofish

When recovering un-turbofish-ed args in expr position (e.g. `let x = a<T, U>();` in `check_mistyped_turbofish_with_multiple_type_params`, we used `parse_seq_to_before_end` to parse the fake generic args; however, it used `parse_generic_arg` which *optionally* parses a generic arg. If it doesn't end up parsing an arg, it returns `Ok(None)` and consumes no tokens. If we don't find a delimiter after this (`,`), we try parsing *another* element. In this case, we just infinitely loop looking for a subsequent element.

We can fix this by making sure that we either parse a generic arg or error in `parse_seq_to_before_end`'s callback.

Fixes rust-lang#124897
@rustbot 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 11, 2024
@jieyouxu
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 11, 2024

📌 Commit e7bb090 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-review Status: Awaiting review from the assignee but also interested parties. labels May 11, 2024
@bors
Copy link
Collaborator

bors commented May 11, 2024

⌛ Testing commit e7bb090 with merge f9a3fd9...

@bors
Copy link
Collaborator

bors commented May 11, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing f9a3fd9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 11, 2024
@bors bors merged commit f9a3fd9 into rust-lang:master May 11, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 11, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#124233 Add -lmingwex second time in mingw_libs c277b80fb9594ba3e53611040a51aa1f4b96435b (link)
#124318 ignore generics args in attribute paths 65b27ae137b1c3ba2bddae13fcf607fb7950c8d0 (link)
#124899 bootstrap: add comments for the automatic dry run 745e9327c2f1f9e0bb2a90b26d0129cf7ba76c2a (link)
#124904 reachable computation: extend explanation of what this does… 216e425f0ca4f6951560fa4cdd3d1154064d4d0a (link)
#124930 Make sure we consume a generic arg when checking mistyped t… ee7682e38708c4edeceea5ad20f72bdc5bafc6aa (link)

previous master: 19dacee0d8

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@jieyouxu jieyouxu deleted the rollup-u02aso7 branch May 11, 2024 02:54
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f9a3fd9): 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

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.

mean range count
Regressions ❌
(primary)
2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [-2.1%, 2.4%] 2

Cycles

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

Binary size

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

Bootstrap: 673.18s -> 675.13s (0.29%)
Artifact size: 315.98 MiB -> 316.00 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

8 participants