Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 21 pull requests #119549

Merged
merged 48 commits into from
Jan 3, 2024
Merged

Rollup of 21 pull requests #119549

merged 48 commits into from
Jan 3, 2024

Conversation

fmease
Copy link
Member

@fmease fmease commented Jan 3, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 30 commits December 23, 2023 04:11
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
It is not important which one is used since `is_dangling` does not access
memory, but `*const` removes the needs of `*const T` -> `*mut T` casts
in `from_raw_in`.
The original tracking issue was superseded by a new one
(constrainted naked functions) and therefore is closed.
and calculate the z-indices of things that go over the sidebar
When rust-lang#118865 started enforcing the `rustc::potential_query_instability` lint in
`rustc_codegen_llvm`, it added an exemption for this site, arguing that the
entries are only used to create a list of filenames that is later sorted.

However, the list of entries also gets traversed when creating the function
coverage records in LLVM IR, which may be sensitive to hash-based ordering.

This patch therefore changes `function_coverage_map` to use `FxIndexMap`, which
should avoid hash-based instability by iterating in insertion order.
No reason why this needs to be a `bug!()`.
LLVM 18 will automatically infer `noundef` in some situations.
Adjust codegen tests to accept this.

See llvm/llvm-project#76553 for why `noundef` is being generated now.
`local_key_cell_methods` has been stable for a while and provides a much less
clunky way to interface with thread-local variables.

Additionaly add context to the documentation about why types with interior
mutability are needed.
…-errors

Query panic!() to useful diagnostic

Changes some more ICEs from bare panic!()s

Adds an `expect_job()` helper method as that is a moral equivalent of what was happening at the uses.

re:rust-lang#118955
…davidtwco

Remove unnecessary arm in `check_expr_yield`

We always set up the `resume_yield_tys` for async blocks and fns, so this arm was unreachable.
…warning-for-ci, r=Mark-Simulacrum

suppress change-tracker warnings in CI containers

Fixes rust-lang#119296
…tes, r=JohnTitor

Update `thread_local` examples to use `local_key_cell_methods`

`local_key_cell_methods` has been stable for a while and provides a much less clunky way to interface with thread-local

Additionaly add context to the documentation about why types with interior mutability are needed.

r? libs
…rieb

Fix: Properly set vendor in i686-win7-windows-msvc target

In rust-lang#118150 , setting the `vendor` field of the `i686-win7-windows-msvc` target was forgotten, preventing us from easily checking the target using `cfg(target_vendor)`.

With this PR, we set the target vendor to "win7".
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 3, 2024
@fmease
Copy link
Member Author

fmease commented Jan 3, 2024

Okay, let's try this again. Context: https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Apple.20runner.20billing.20problem is soon getting fixed (#119546), fingers crossed.

@fmease
Copy link
Member Author

fmease commented Jan 3, 2024

Imma r- the rollup of 13 PRs, #119516, in favor of this one.
Setting the priority to 19 to prioritize #119485.

@bors r+ rollup=never p=19

@bors
Copy link
Contributor

bors commented Jan 3, 2024

📌 Commit 9b2a44a has been approved by fmease

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 3, 2024

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Jan 3, 2024
@bors
Copy link
Contributor

bors commented Jan 3, 2024

⌛ Testing commit 9b2a44a with merge 139fb22...

@bors
Copy link
Contributor

bors commented Jan 3, 2024

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 139fb22 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 3, 2024
@bors bors merged commit 139fb22 into rust-lang:master Jan 3, 2024
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 3, 2024
@Noratrieb
Copy link
Member

🚀

@fmease fmease deleted the rollup-jxvbfes branch January 3, 2024 20:39
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119086 Query panic!() to useful diagnostic 5b35d53a60530ab2ebc7e5894e27f1596512737b (link)
#119239 Remove unnecessary arm in check_expr_yield 1c0d0f2e0e953a674b31b961c401bde1f7716645 (link)
#119298 suppress change-tracker warnings in CI containers d8aa6d721b9bd723eb461a1a7f5aa0fee391f011 (link)
#119319 Document that File does not buffer reads/writes 4fbd256adb8283bb923e806b519867b427f2ff0f (link)
#119434 rc: Take *const T in is_dangling 00f88b39907135e848ca5890fdd2c61febf130b9 (link)
#119444 Rename TyCtxt::is_closure to `TyCtxt::is_closure_or_corou… 06e429294281e5d7a1b7cf793d25da4484139c50 (link)
#119474 Update tracking issue of naked_functions bc3e582ce52dc11c782a74babe884ff1761aa710 (link)
#119476 Pretty-print always-const trait predicates correctly 4af3606f78c7d3db78f171e8663321a7f534adfd (link)
#119477 rustdoc ui: adjust tooltip z-index to be above sidebar 6fd7f0df68acfd9c7818cc02a0020882959be387 (link)
#119479 Remove two unused feature gates from rustc_query_impl de23ea8c95f787a1781ab1987ad30e1e3453efbd (link)
#119487 Minor improvements in comment on freshen.rs bad6e340a85a63b35654d981d0294e047f8b1c37 (link)
#119492 Update books c131dacf037b7f3768c7947423f79b99671d53eb (link)
#119494 Deny defaults for higher-ranked generic parameters d88a0ad4436e1dc53cb28d1001ae62158b0a0bce (link)
#119498 Update deadlinks of strict_provenance lints 5ceb8ada827757d84467afb0bfdb0ae0d1616332 (link)
#119505 Don't synthesize host effect params for trait associated fu… d18f0085e06f04f9ef41eefb27a0421126039935 (link)
#119510 Report I/O errors from rmeta encoding with emit_fatal b12ed75ed24a08d8b38208a06449a36ef952881d (link)
#119512 Mark myself as back from leave feac43f8ee029176baa24a2aa5af1c9efc9b6c05 (link)
#119514 coverage: Avoid a query stability hazard in `function_cover… 7211acdcf13f84048b99f2067c30c6f3e145ae33 (link)
#119523 llvm: Allow noundef in codegen tests eaab8b51f6698612fdb3fd54d6d0e6806efee340 (link)
#119534 Update thread_local examples to use `local_key_cell_metho… b2a22bedaed6038f0786b275173b33b1840551e0 (link)
#119544 Fix: Properly set vendor in i686-win7-windows-msvc target 6fa532b268d6de706864ac72876817174fb03ddd (link)

previous master: 1a47f5b448

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (139fb22): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.3% [0.3%, 0.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

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)
4.0% [4.0%, 4.0%] 1
Regressions ❌
(secondary)
2.8% [2.8%, 2.8%] 1
Improvements ✅
(primary)
-4.5% [-9.4%, -0.1%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.8% [-9.4%, 4.0%] 5

Cycles

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

Binary size

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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.2%, -0.0%] 5
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-0.2%, -0.0%] 5

Bootstrap: 667.833s -> 672.621s (0.72%)
Artifact size: 311.85 MiB -> 311.84 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.