Skip to content

Rollup of 7 pull requests #102192

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 23 commits into from
Sep 23, 2022
Merged

Rollup of 7 pull requests #102192

merged 23 commits into from
Sep 23, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 23 commits September 21, 2022 14:17
Added examples to `bool::then` and `bool::then_some` to show the distinction between the eager evaluation of `bool::then_some` and the lazy evaluation of `bool::then`.
Trailing whitespace seemed to be causing the CI checks to error out.
Instead of relying on a command line parameter, detect if a target
is able to unwind or not.
Ignore tests that require unwinding on targets that don't support it.
This test case actually requires std::process.
…ng-docs, r=scottmcm

Add missing documentation for `bool::from_str`

Fixes rust-lang#101870.
Add examples to `bool::then` and `bool::then_some`

Added examples to `bool::then` and `bool::then_some` to show the distinction between the eager evaluation of `bool::then_some` and the lazy evaluation of `bool::then`.
Detect panic strategy using `rustc --print cfg`

Instead of relying on a command line parameter, detect if a target is able to unwind or not.
Ignore tests that require unwinding on targets that don't support it.

I did not find any place where the removed parameter has been used, but it feels a bit risky as
I'm new to this test framework.

r? bjorn3
… r=lcnr

Don't convert valtree to constvalue during normalization

r? ``@lcnr``
add regression test for miri issue 2433

Adding this here because the test needs to be run with debug assertions enabled to be sure so I had to run it in the rustc workspace.

Cc rust-lang/miri#2433
r? ``@oli-obk``
…=Dylan-DPC

Fix a typo in `std`'s root docs

Remarkably, this typo has been present for *seven years.* I was so surprised that I reread the text five times and then asked people on the rust Zulip to double-check. :)
@rustbot rustbot added 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 Sep 23, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Sep 23, 2022

📌 Commit dfe045a has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 23, 2022
@bors
Copy link
Collaborator

bors commented Sep 23, 2022

⌛ Testing commit dfe045a with merge 4a14677...

@bors
Copy link
Collaborator

bors commented Sep 23, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4a14677 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2022
@bors bors merged commit 4a14677 into rust-lang:master Sep 23, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 23, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#102177 3c262fa3c3a443b5cddc9a49741339f3c03c3732
#102158 b64b12fa6f5b7f33b9283171667d78542ed70102
#102148 f8dc2a8f8cc958a9ae4f5b9dea1e6257d1329acb
#102137 4459db43986fe39b705385d5eef0cc2be0749648
#102134 b55837c2940927706458835837d2f842f802881f
#102115 5ed6ad7945735f9811d4fa26fa42f62de8002848
#102094 1272b483eef4ae64a78e211218b75e591cd6fa14

previous master: 9a963e3bad

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 (4a14677): comparison URL.

Overall result: ✅ improvements - 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.

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

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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.8% [3.8%, 3.8%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.1% [-4.1%, -4.1%] 1
All ❌✅ (primary) - - 0

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

oli-obk pushed a commit to oli-obk/rust that referenced this pull request Sep 28, 2022
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#102094 (Add missing documentation for `bool::from_str`)
 - rust-lang#102115 (Add examples to `bool::then` and `bool::then_some`)
 - rust-lang#102134 (Detect panic strategy using `rustc --print cfg`)
 - rust-lang#102137 (Don't convert valtree to constvalue during normalization)
 - rust-lang#102148 (add regression test for miri issue 2433)
 - rust-lang#102158 (rustdoc: clean up CSS/DOM for deprecation warnings)
 - rust-lang#102177 (Fix a typo in `std`'s root docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr deleted the rollup-0ctjzco branch October 9, 2022 00:30
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#102094 (Add missing documentation for `bool::from_str`)
 - rust-lang#102115 (Add examples to `bool::then` and `bool::then_some`)
 - rust-lang#102134 (Detect panic strategy using `rustc --print cfg`)
 - rust-lang#102137 (Don't convert valtree to constvalue during normalization)
 - rust-lang#102148 (add regression test for miri issue 2433)
 - rust-lang#102158 (rustdoc: clean up CSS/DOM for deprecation warnings)
 - rust-lang#102177 (Fix a typo in `std`'s root docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
# 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.