Skip to content

Rollup of 7 pull requests #125423

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 18 commits into from
May 22, 2024
Merged

Rollup of 7 pull requests #125423

merged 18 commits into from
May 22, 2024

Conversation

fmease
Copy link
Member

@fmease fmease commented May 22, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 18 commits May 12, 2024 10:03
For something that wasn't obvious to me.
Because explicit macro imports are better than implicit macro imports.
…, r=scottmcm

reference type safety invariant docs: clarification

The old text could have been read as saying that you can call a function if these requirements are upheld, which is definitely not true as they are an underapproximation of the actual safety invariant.

I removed the part about functions relaxing the requirements via their documentation... this seems incoherent with saying that it may actually be unsound to ever temporarily violate the requirement. Furthermore, a function *cannot* just relax this for its return value, that would in general be unsound. And the part about "unsafe code in a safe function may assume these invariants are ensured of arguments passed by the caller" also interacts with relaxing things: clearly, if the invariant has been relaxed, unsafe code cannot rely on it any more. There may be a place to give general guidance on what kinds of function contracts can exist, but the reference type is definitely not the right place to write that down.

I also took a clarification from rust-lang#121965 that is orthogonal to the rest of that PR.

Cc ```@joshlf``` ```@scottmcm```
…cy, r=oli-obk

Force the inner coroutine of an async closure to `move` if the outer closure is `move` and `FnOnce`

See the detailed comment in `upvar.rs`.

Fixes rust-lang#124867.
Fixes rust-lang#124487.

r? oli-obk
…pture, r=nnethercote

Use Backtrace::force_capture instead of Backtrace::capture in rustc_log

After rust-lang#125063, the compiler and custom drivers won't automatically set the RUST_BACKTRACE environment variable anymore, so we have to call `Backtrace::force_capture` instead of `Backtrace::capture` to unconditionally capture a backtrace.

rustc_log handles enabling backtraces via env vars itself, so we don't want RUST_BACKTRACE to make a difference.
rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 7)

Follow up

* rust-lang#116214
* rust-lang#116432
* rust-lang#116824
* rust-lang#118105
* rust-lang#119561
* rust-lang#123574

As always, it's easier to review the commits one at a time. Don't use the Files Changed tab. It's confusing.
…=compiler-errors

Minor serialize/span tweaks

r? ``@jackh726``
Remove unnecessary `.md` from the documentation sidebar

Oversight from rust-lang#124772, caught in rust-lang#124772 (comment).

r? weihanglo
…piler-errors

Stop using `to_hir_binop` in codegen

This came up in rust-lang#125359 (comment) , and looking into it we can just use the `mir::BinOp`s directly instead of `hir::BinOpKind`s.

(AKA rather than going `mir::BinOp` → `hir::BinOpKind` → `IntPredicate`, just go `mir::BinOp` → `IntPredicate`.)
@rustbot 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. 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 May 22, 2024
@fmease
Copy link
Member Author

fmease commented May 22, 2024

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented May 22, 2024

📌 Commit 412c46c has been approved by fmease

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 22, 2024
@bors

This comment was marked as outdated.

bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#125043 (reference type safety invariant docs: clarification)
 - rust-lang#125306 (Force the inner coroutine of an async closure to `move` if the outer closure is `move` and `FnOnce`)
 - rust-lang#125355 (Use Backtrace::force_capture instead of Backtrace::capture in rustc_log)
 - rust-lang#125382 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 7))
 - rust-lang#125391 (Minor serialize/span tweaks)
 - rust-lang#125395 (Remove unnecessary `.md` from the documentation sidebar)
 - rust-lang#125399 (Stop using `to_hir_binop` in codegen)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented May 22, 2024

⌛ Testing commit 412c46c with merge 9cdfe28...

@bors
Copy link
Collaborator

bors commented May 22, 2024

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 9cdfe28 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 22, 2024
@bors bors merged commit 9cdfe28 into rust-lang:master May 22, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 22, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#125043 reference type safety invariant docs: clarification 6d6f92affcc9e6e0a2aabe48bf97b4717724a3a2 (link)
#125306 Force the inner coroutine of an async closure to move if … 2308a7cdeb0eac411a41c78e147e18b2ea13bbf0 (link)
#125355 Use Backtrace::force_capture instead of Backtrace::capture … 992f54e37a142c9739cf8ce4dde32601eea4b836 (link)
#125382 rustdoc: rename issue-\d+.rs tests to have meaningful nam… 5a12e868a6f291cd493d34f4a511604de571a9bc (link)
#125391 Minor serialize/span tweaks b0a93d81504973554ad498102f9057bd96d4f3c3 (link)
#125395 Remove unnecessary .md from the documentation sidebar bd05c5c168d22a7b2d95ed338b06931120ba90b3 (link)
#125399 Stop using to_hir_binop in codegen 8453702891264a0551f6e3beca0f98ed5937e4b6 (link)

previous master: 93e7cb835a

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

@fmease fmease deleted the rollup-ne4l9y4 branch May 23, 2024 00:21
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9cdfe28): 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 (primary -1.5%)

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)
1.1% [1.1%, 1.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-4.1% [-4.1%, -4.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.5% [-4.1%, 1.1%] 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.478s -> 674.126s (0.10%)
Artifact size: 315.67 MiB -> 315.70 MiB (0.01%)

# for free to join this conversation on GitHub. Already have an account? # 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-compiler Relevant to the compiler 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.