Rollup of 9 pull requests #81761

m-ou-se · 2021-02-04T20:10:45Z

Successful merges:

Stabilize the Wake trait #74304 (Stabilize the Wake trait)
Rename Iterator::fold_first to reduce and stabilize it #79805 (Rename Iterator::fold_first to reduce and stabilize it)
introduce future-compatibility warning for forbidden lint groups #81556 (introduce future-compatibility warning for forbidden lint groups)
Add lint for panic!(123) which is not accepted in Rust 2021. #81645 (Add lint for panic!(123) which is not accepted in Rust 2021.)
OsStr eq_ignore_ascii_case takes arg by value #81710 (OsStr eq_ignore_ascii_case takes arg by value)
add #[inline] to all the public IpAddr functions #81711 (add #[inline] to all the public IpAddr functions)
Move test to be with the others #81725 (Move test to be with the others)
Revert stabilizing integer::BITS. #81727 (Revert stabilizing integer::BITS.)
Stabilize poison API of Once, rename poisoned() #81745 (Stabilize poison API of Once, rename poisoned())

Failed merges:

r? @ghost
@rustbot modify labels: rollup

We used to ignore `forbid(group)` scenarios completely. This changed in rust-lang#78864, but that led to a number of regressions (rust-lang#80988, rust-lang#81218). This PR introduces a future compatibility warning for the case where a group is forbidden but then an individual lint within that group is allowed. We now issue a FCW when we see the "allow", but permit it to take effect.

Per a comment on rust-lang#70516 this changes `eq_ignore_ascii_case` to take the generic parameter `S: AsRef<OsStr>` by value instead of by reference. This is technically a breaking change to an unstable method. I think the only way it would break is if you called this method with an explicit type parameter, ie `my_os_str.eq_ignore_ascii_case::<str>("foo")` becomes `my_os_str.eq_ignore_ascii_case::<&str>("foo")`. Besides that, I believe it is overall more flexible since it can now take an owned `OsString` for example. If this change should be made in some other PR (like rust-lang#80193) then please just close this.

Co-Authored-By: Ashley Mannix <kodraus@hey.com>

This extends the `panic_fmt` lint to warn for all cases where the first argument cannot be interpreted as a format string, as will happen in Rust 2021. It suggests to add `"{}", ` to format the message as a string. In the case of `std::panic!()`, it also suggests the recently stabilized `std::panic::panic_any()` function as an alternative. It renames the lint to `non_fmt_panic` to match the lint naming guidelines.

This stabilizes: * `OnceState` * `OnceState::is_poisoned()` (previously named `poisoned()`) * `Once::call_once_force()` `poisoned()` was renamed because the new name is more clear as a few people agreed and nobody objected. Closes rust-lang#33577

Stabilize the Wake trait This PR proposes stabilizing the `wake_trait` feature, tracking issue rust-lang#69912. ## Motivation The surface area this trait introduces is small, and it has been on nightly for 4 months without any reported issues. Given the surface area of this trait is small and only serves to provide a safe interface around the already stable [`std::task::RawWakerVTable`](https://doc.rust-lang.org/std/task/struct.RawWaker.html) it seems unlikely this trait will require any further changes. So I'm proposing we stabilize this. Personally I would love to have this available on stable, since it would enable cleaning up some runtime internals by removing the tedious pointer required to construct a [`RawWakerVTable`](https://doc.rust-lang.org/std/task/struct.RawWakerVTable.html). I believe the intent was always to introduce a `Wake` counterpart to `RawWaker` in order to safely construct `Waker` instances. And the `Wake` trait feels like it does that job as intended. ## Implementation notes This PR itself fixes a link in the docs, and introduces an example of how to use the trait: a minimal `block_on` example that runs a future to completion on the current thread. It doesn't include fancier features such as support for nesting, but is intended to serve as a teaching device for both `task::Wake` and futures alike.

Rename Iterator::fold_first to reduce and stabilize it This stabilizes `#![feature(iterator_fold_self)]`. The name for this function (originally `fold_first`) was still an open question, but the discussion on [the tracking issue](rust-lang#68125) seems to have converged to `reduce`.

…lint, r=pnkfelix introduce future-compatibility warning for forbidden lint groups We used to ignore `forbid(group)` scenarios completely. This changed in rust-lang#78864, but that led to a number of regressions (rust-lang#80988, rust-lang#81218). This PR introduces a future compatibility warning for the case where a group is forbidden but then an individual lint within that group is allowed. We now issue a FCW when we see the "allow", but permit it to take effect. r? ``@Mark-Simulacrum``

…1995 Add lint for `panic!(123)` which is not accepted in Rust 2021. This extends the `panic_fmt` lint to warn for all cases where the first argument cannot be interpreted as a format string, as will happen in Rust 2021. It suggests to add `"{}",` to format the message as a string. In the case of `std::panic!()`, it also suggests the recently stabilized `std::panic::panic_any()` function as an alternative. It renames the lint to `non_fmt_panic` to match the lint naming guidelines. ![image](https://user-images.githubusercontent.com/783247/106520928-675ea680-64d5-11eb-81f7-d8fa48b93a0b.png) This is part of rust-lang#80162. r? ```@estebank```

OsStr eq_ignore_ascii_case takes arg by value Per a comment on rust-lang#70516 this changes `eq_ignore_ascii_case` to take the generic parameter `S: AsRef<OsStr>` by value instead of by reference. This is technically a breaking change to an unstable method. I think the only way it would break is if you called this method with an explicit type parameter, ie `my_os_str.eq_ignore_ascii_case::<str>("foo")` becomes `my_os_str.eq_ignore_ascii_case::<&str>("foo")`. Besides that, I believe it is overall more flexible since it can now take an owned `OsString` for example. If this change should be made in some other PR (like rust-lang#80193) then please just close this.

add #[inline] to all the public IpAddr functions

Move test to be with the others No functional changes. I just created this test in the wrong place in a past PR. All of the other or-pattern tests are in the `or-patterns` directory.

…mulacrum Revert stabilizing integer::BITS. We agreed in the libs meeting just now to revert stablization, since the [breakage](rust-lang#81654) is significant throughout the ecosystem, through `lexical-core`. cc rust-lang#76904 Fixes rust-lang#81654

…ou-se Stabilize poison API of Once, rename poisoned() This stabilizes: * `OnceState` * `OnceState::is_poisoned()` (previously named `poisoned()`) * `Once::call_once_force()` `poisoned()` was renamed because the new name is more clear as a few people agreed and nobody objected. Closes rust-lang#33577 Notes: * I'm not entirely sure it's supposed to be 1.51, LMK if I did it wrong * I failed to run tests locally, so we will have to leave it to bors or someone else can try

m-ou-se · 2021-02-04T20:11:12Z

@bors r+ p=9 rollup=never

bors · 2021-02-04T20:11:14Z

📌 Commit 6f014cd has been approved by m-ou-se

bors · 2021-02-04T20:14:51Z

⌛ Testing commit 6f014cd with merge e4d4bd236ceb2e9d3eeb4557ca2bb4f9bd244fab...

m-ou-se · 2021-02-04T20:19:01Z

@bors retry

bors · 2021-02-04T20:19:11Z

⌛ Testing commit 6f014cd with merge cffac48059b8e99dcbe452129c5430188a8e7582...

m-ou-se · 2021-02-04T20:22:37Z

@bors treeclosed=1000

dist-x86_64-mingw keeps failing with:

cp: '/c/hostedtoolcache/windows/Python/3.9.1/x64/python.exe' and '/c/hostedtoolcache/windows/Python/3.9.1/x64/python3.exe' are the same file
Error: Process completed with exit code 1.

bors · 2021-02-04T20:24:00Z

💔 Test failed - checks-actions

m-ou-se · 2021-02-04T20:25:54Z

@bors retry

(For when the tree re-opens.)

rust-log-analyzer · 2021-02-04T20:44:02Z

A job failed! Check out the build log: (web) (plain)

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

  SCRIPT: python x.py dist
  DEPLOY: 1
  WIX: /d/a/rust/rust/wix
##[endgroup]
cp: '/c/hostedtoolcache/windows/Python/3.9.1/x64/python.exe' and '/c/hostedtoolcache/windows/Python/3.9.1/x64/python3.exe' are the same file
##[error]Process completed with exit code 1.
[command]"C:\Program Files\Git\bin\git.exe" version
git version 2.30.0.windows.2
[command]"C:\Program Files\Git\bin\git.exe" config --local --name-only --get-regexp core\.sshCommand
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"
[command]"C:\Program Files\Git\bin\git.exe" config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader
http.https://github.com/.extraheader
[command]"C:\Program Files\Git\bin\git.exe" config --local --unset-all http.https://github.com/.extraheader
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :"
Cleaning up orphan processes
Terminate orphan process: pid (2856) (node)
Terminate orphan process: pid (7092) (python)
Terminate orphan process: pid (1080) (vctip)

rust-log-analyzer · 2021-02-04T20:57:25Z

A job failed! Check out the build log: (web) (plain)

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

  SCRIPT: python x.py dist
  DEPLOY: 1
  WIX: /d/a/rust/rust/wix
##[endgroup]
cp: '/c/hostedtoolcache/windows/Python/3.9.1/x64/python.exe' and '/c/hostedtoolcache/windows/Python/3.9.1/x64/python3.exe' are the same file
##[error]Process completed with exit code 1.
[command]"C:\Program Files\Git\bin\git.exe" version
git version 2.30.0.windows.2
[command]"C:\Program Files\Git\bin\git.exe" config --local --name-only --get-regexp core\.sshCommand
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"
[command]"C:\Program Files\Git\bin\git.exe" config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader
http.https://github.com/.extraheader
[command]"C:\Program Files\Git\bin\git.exe" config --local --unset-all http.https://github.com/.extraheader
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :"
Cleaning up orphan processes
Terminate orphan process: pid (7064) (node)
Terminate orphan process: pid (3768) (python)
Terminate orphan process: pid (6324) (vctip)

m-ou-se · 2021-02-04T23:16:04Z

@bors treeclosed-

bors · 2021-02-04T23:16:13Z

⌛ Testing commit 6f014cd with merge dab3a80...

bors · 2021-02-05T02:08:49Z

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing dab3a80 to master...

rust-highfive · 2021-02-05T02:10:00Z

📣 Toolstate changed by #81761!

Tested on commit dab3a80.
Direct link to PR: #81761

💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).

@oli-obk

Tested on commit rust-lang/rust@dab3a80. Direct link to PR: <rust-lang/rust#81761> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung). 💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).

nikomatsakis and others added 25 commits February 2, 2021 18:21

add #[inline] to all the public IpAddr functions

d3d0fb7

Stabilize the Wake trait

2c8bf1d

Co-Authored-By: Ashley Mannix <kodraus@hey.com>

move test to be with the others

3719247

Revert stabilizing integer::BITS.

8988238

Make panic/assert calls in rustc compatible with Rust 2021.

34d5ac2

Allow/fix non_fmt_panic in tests.

e9ad5be

Update panic!() documentation about non-string panics.

753b0b0

Fix/allow non_fmt_panic in clippy tests.

3f3eb89

Suggest panic!("{}", ..) instead of panic!(..) clippy::expect_fun_call.

0870c15

Rename Iterator::fold_first to reduce.

5c056ed

Improve documentation of Iterator::{fold, reduce}.

26af55f

Stabilize feature(iterator_fold_self): Iterator::reduce

24e0940

Rollup merge of rust-lang#81711 - saethlin:ipaddr-inline, r=m-ou-se

e0ddc05

add #[inline] to all the public IpAddr functions

Rollup merge of rust-lang#81725 - mark-i-m:mv-test, r=Mark-Simulacrum

83e0fe3

Move test to be with the others No functional changes. I just created this test in the wrong place in a past PR. All of the other or-pattern tests are in the `or-patterns` directory.

rustbot added the rollup A PR which is a rollup label Feb 4, 2021

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 4, 2021

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 Feb 4, 2021

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 Feb 4, 2021

bors mentioned this pull request Feb 4, 2021

CI: only copy python.exe to python3.exe if the latter does not exist #81762

Merged

This was referenced Feb 4, 2021

Generic associated types in trait paths #79554

Merged

rustc_codegen_ssa: tune codegen scheduling to reduce memory usage #81736

Merged

Cleanup rustdoc pass descriptions a bit #81763

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 5, 2021

bors merged commit dab3a80 into rust-lang:master Feb 5, 2021

rustbot added this to the 1.51.0 milestone Feb 5, 2021

rust-highfive mentioned this pull request Feb 5, 2021

miri no longer builds after rust-lang/rust#81761 #81770

Closed

This was referenced Feb 5, 2021

stabilize feature(osstring_ascii) #80193

Merged

Stabilize or_patterns (RFC 2535, 2530, 2175) #79278

Merged

Stabilize the "IP" feature #76098

Closed

[beta] Rename panic_fmt lint to non_fmt_panic #81729

Closed

m-ou-se deleted the rollup-xp7v07n branch February 5, 2021 08:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 9 pull requests #81761

Rollup of 9 pull requests #81761

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

rust-log-analyzer commented Feb 4, 2021

Uh oh!

rust-log-analyzer commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

bors commented Feb 5, 2021

Uh oh!

rust-highfive commented Feb 5, 2021

Uh oh!

Uh oh!

Rollup of 9 pull requests #81761

Rollup of 9 pull requests #81761

Uh oh!

Conversation

m-ou-se commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

rust-log-analyzer commented Feb 4, 2021

Uh oh!

rust-log-analyzer commented Feb 4, 2021

Uh oh!

m-ou-se commented Feb 4, 2021

Uh oh!

bors commented Feb 4, 2021

Uh oh!

bors commented Feb 5, 2021

Uh oh!

rust-highfive commented Feb 5, 2021

Uh oh!

Uh oh!