Rollup of 7 pull requests #67342

Centril · 2019-12-16T04:23:41Z

Successful merges:

Stabilize std::{rc,sync}::Weak::{weak_count, strong_count} #65778 (Stabilize std::{rc,sync}::Weak::{weak_count, strong_count})
stabilize Result::map_or #66570 (stabilize Result::map_or)
Add str::strip_prefix and str::strip_suffix #66735 (Add str::strip_prefix and str::strip_suffix)
Stabilize the core::panic module #66771 (Stabilize the core::panic module)
fix type_name_of_val doc comment #67317 (fix type_name_of_val doc comment)
Fix repetition in matches/mod.rs #67324 (Fix repetition in matches/mod.rs)
cleanup with push_fake_read #67325 (cleanup with push_fake_read)

Failed merges:

Note `#![unstable]` v.s. `#[unstable]`

rust-lang#44489 was closed when the `#[panic_handler]` attribute was stabilized.

`std::panic` is already stable. `core::panic::PanicInfo` and `core::panic::Location` are stable and can be used through that path because of a bug in stability checking: rust-lang#15702

@bdonlan

Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}` * Original PR: rust-lang#56696 * Tracking issue: rust-lang#57977 Closes: rust-lang#57977 Supporting comments: > Although these were added for testing, it is occasionally useful to have a way to probe optimistically for whether a weak pointer has become dangling, without actually taking the overhead of manipulating atomics. Are there any plans to stabilize this? _Originally posted by @bdonlan in rust-lang#57977 (comment) > Having this stabilized would help. Currently, the only way to check if a weak pointer has become dangling is to call `upgrade`, which is by far expensive. _Originally posted by @glebpom in rust-lang#57977 (comment) Not sure if stabilizing these warrants a full RFC, so throwing this out here as a start for now. Note: per CONTRIBUTING.md, I ran the tidy checks, but they seem to be failing on unchanged files (primarily in `src/stdsimd`).

@SimonSapin

…ylan-DPC stabilize Result::map_or r? @SimonSapin Closes rust-lang#66293

Add str::strip_prefix and str::strip_suffix Introduces a counterpart for `Path::strip_prefix` on `str`. This was also discussed in https://internals.rust-lang.org/t/pre-pr-path-strip-prefix-counterpart-in-str/11364/.

Stabilize the `core::panic` module `std::panic` is already stable. `core::panic::PanicInfo` and `core::panic::Location` are stable and can be used through that path because of a bug in stability checking: rust-lang#15702

fix type_name_of_val doc comment .

@matthewjasper

…matthewjasper Fix repetition in matches/mod.rs r? @matthewjasper

@matthewjasper

…sper cleanup with push_fake_read ...and make things a bit more readable. r? @matthewjasper

Centril · 2019-12-16T04:24:16Z

@bors r+ p=2000 rollup=never treeclosed-

bors · 2019-12-16T04:24:18Z

📌 Commit 71a9a99 has been approved by Centril

bors · 2019-12-16T04:24:19Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

bors · 2019-12-16T04:24:32Z

⌛ Testing commit 71a9a99 with merge e041050ecda88d1cb1153ceb628b310706208600...

rust-highfive · 2019-12-16T04:30:29Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-16T04:28:58.7785174Z Step 1/12 : FROM ubuntu:16.04
2019-12-16T04:29:02.9767332Z received unexpected HTTP status: 500 Server Error
2019-12-16T04:29:02.9779689Z The command has failed after 5 attempts.
2019-12-16T04:29:02.9809456Z 
2019-12-16T04:29:02.9900093Z ##[error]Bash exited with code '1'.
2019-12-16T04:29:02.9963135Z ##[section]Starting: Checkout
2019-12-16T04:29:02.9965052Z ==============================================================================
2019-12-16T04:29:02.9965132Z Task         : Get sources
2019-12-16T04:29:02.9965226Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-12-16T04:30:40Z

💔 Test failed - checks-azure

Centril · 2019-12-16T04:31:26Z

@bors retry

bors · 2019-12-16T07:01:05Z

⌛ Testing commit 71a9a99 with merge e8d80d26dd08670c267c5c853baac9ee3e05a7f2...

rust-highfive · 2019-12-16T07:04:29Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-16T07:03:51.8367716Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-16T07:03:51.8367991Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-16T07:03:51.8373470Z 
2019-12-16T07:03:51.8377955Z Failures
2019-12-16T07:03:51.8385312Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-12-16T07:03:51.8385488Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-12-16T07:03:51.8401183Z Did you know the proceeds of Pro (and some proceeds from other
2019-12-16T07:03:51.8401301Z  licensed editions) go into bettering the community infrastructure?
2019-12-16T07:03:51.8401391Z  Your support ensures an active community, keeps Chocolatey tip top,
2019-12-16T07:03:51.8401492Z  plus it nets you some awesome features!
2019-12-16T07:03:51.8401492Z  plus it nets you some awesome features!
2019-12-16T07:03:51.8401561Z  https://chocolatey.org/compare
2019-12-16T07:03:52.3403737Z 
2019-12-16T07:03:52.8926225Z ##[error]Bash exited with code '1'.
2019-12-16T07:03:52.9088927Z ##[section]Starting: Checkout
2019-12-16T07:03:52.9210119Z ==============================================================================
2019-12-16T07:03:52.9210212Z Task         : Get sources
2019-12-16T07:03:52.9210307Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-12-16T07:04:34Z

💔 Test failed - checks-azure

Centril · 2019-12-16T07:52:20Z

@bors retry

bors · 2019-12-16T07:52:30Z

⌛ Testing commit 71a9a99 with merge 3deef0e...

@ghost

Rollup of 7 pull requests Successful merges: - #65778 (Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}`) - #66570 (stabilize Result::map_or) - #66735 (Add str::strip_prefix and str::strip_suffix) - #66771 (Stabilize the `core::panic` module) - #67317 (fix type_name_of_val doc comment) - #67324 (Fix repetition in matches/mod.rs) - #67325 (cleanup with push_fake_read) Failed merges: r? @ghost

rust-highfive · 2019-12-16T07:56:28Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-16T07:55:38.5217164Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-16T07:55:38.5217306Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-16T07:55:38.5221712Z 
2019-12-16T07:55:38.5226888Z Failures
2019-12-16T07:55:38.5233588Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-12-16T07:55:38.5233764Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-12-16T07:55:38.5248651Z Enjoy using Chocolatey? Explore more amazing features to take your
2019-12-16T07:55:38.5248778Z experience to the next level at
2019-12-16T07:55:38.5248852Z  https://chocolatey.org/compare
2019-12-16T07:55:39.0366572Z 
2019-12-16T07:55:39.0366572Z 
2019-12-16T07:55:39.0452565Z ##[error]Bash exited with code '1'.
2019-12-16T07:55:39.0619097Z ##[section]Starting: Checkout
2019-12-16T07:55:39.0730750Z ==============================================================================
2019-12-16T07:55:39.0730884Z Task         : Get sources
2019-12-16T07:55:39.0730999Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-12-16T07:56:32Z

💔 Test failed - checks-azure

pietroalbini · 2019-12-16T12:10:55Z

@bors retry

bors · 2019-12-16T12:11:09Z

⌛ Testing commit 71a9a99 with merge f0d4b57...

@ghost

Rollup of 7 pull requests Successful merges: - #65778 (Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}`) - #66570 (stabilize Result::map_or) - #66735 (Add str::strip_prefix and str::strip_suffix) - #66771 (Stabilize the `core::panic` module) - #67317 (fix type_name_of_val doc comment) - #67324 (Fix repetition in matches/mod.rs) - #67325 (cleanup with push_fake_read) Failed merges: r? @ghost

bors · 2019-12-16T15:31:03Z

☀️ Test successful - checks-azure
Approved by: Centril
Pushing f0d4b57 to master...

Bryan Donlan and others added 22 commits November 21, 2019 18:33

Stabilize std::{rc,sync}::Weak::{weak_count, strong_count}

91ee3d1

Closes: rust-lang#57977

Make Weak::weak_count() return zero when no strong refs remain

0d0b283

Add str::strip_prefix and str::strip_suffix

9badc33

Fix unstable attribute accidentally applying to the entire impl

6ddcf50

Note `#![unstable]` v.s. `#[unstable]`

Improved comments to clarify sasumptions in str::strip_prefix

2e2e0df

Fix the tracking issue number for PanicInfo::message

392e5a7

rust-lang#44489 was closed when the `#[panic_handler]` attribute was stabilized.

Stabilize the core::panic module

eab1dc9

`std::panic` is already stable. `core::panic::PanicInfo` and `core::panic::Location` are stable and can be used through that path because of a bug in stability checking: rust-lang#15702

Fixed formatting issues

4718e20

stabilize Result::map_or

8cae411

make use of Result::map_or

93438fd

Bump Weak::strong_count/weak_count stabilizations from 1.40 to 1.41

9778e03

Set tracking issue for str_strip

6176051

fix doc comment

e28153e

Fix repetition in matches/mod.rs

8a5969d

cleanup with push_fake_read

2d96f20

Rollup merge of rust-lang#66570 - lzutao:stabilize-result-map_or, r=D…

84ef889

…ylan-DPC stabilize Result::map_or r? @SimonSapin Closes rust-lang#66293

Rollup merge of rust-lang#66735 - SOF3:feature/str_strip, r=KodrAus

1c12dc8

Add str::strip_prefix and str::strip_suffix Introduces a counterpart for `Path::strip_prefix` on `str`. This was also discussed in https://internals.rust-lang.org/t/pre-pr-path-strip-prefix-counterpart-in-str/11364/.

Rollup merge of rust-lang#67317 - lcnr:type_name_docs, r=jonas-schievink

d182397

fix type_name_of_val doc comment .

Rollup merge of rust-lang#67324 - Centril:mir-build-match-doc-fix, r=…

9f0cb17

…matthewjasper Fix repetition in matches/mod.rs r? @matthewjasper

Rollup merge of rust-lang#67325 - Centril:push-fake-read, r=matthewja…

71a9a99

…sper cleanup with push_fake_read ...and make things a bit more readable. r? @matthewjasper

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 16, 2019

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 16, 2019

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 Dec 16, 2019

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 Dec 16, 2019

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 Dec 16, 2019

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 Dec 16, 2019

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 Dec 16, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 16, 2019

bors merged commit 71a9a99 into rust-lang:master Dec 16, 2019

bors mentioned this pull request Dec 16, 2019

Enable or disable colored output according to CLICOLOR(_FORCE) #67177

Closed

Centril deleted the rollup-fl44n41 branch December 16, 2019 15:36

JohnTitor added the rollup A PR which is a rollup label Dec 18, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #67342

Rollup of 7 pull requests #67342

Centril commented Dec 16, 2019

Centril commented Dec 16, 2019

bors commented Dec 16, 2019

bors commented Dec 16, 2019

bors commented Dec 16, 2019

rust-highfive commented Dec 16, 2019

bors commented Dec 16, 2019

Centril commented Dec 16, 2019

bors commented Dec 16, 2019

rust-highfive commented Dec 16, 2019

bors commented Dec 16, 2019

Centril commented Dec 16, 2019

bors commented Dec 16, 2019

rust-highfive commented Dec 16, 2019

bors commented Dec 16, 2019

pietroalbini commented Dec 16, 2019

bors commented Dec 16, 2019

bors commented Dec 16, 2019

Rollup of 7 pull requests #67342

Rollup of 7 pull requests #67342

Conversation

Centril commented Dec 16, 2019

Centril commented Dec 16, 2019

bors commented Dec 16, 2019

bors commented Dec 16, 2019

bors commented Dec 16, 2019

rust-highfive commented Dec 16, 2019

bors commented Dec 16, 2019

Centril commented Dec 16, 2019

bors commented Dec 16, 2019

rust-highfive commented Dec 16, 2019

bors commented Dec 16, 2019

Centril commented Dec 16, 2019

bors commented Dec 16, 2019

rust-highfive commented Dec 16, 2019

bors commented Dec 16, 2019

pietroalbini commented Dec 16, 2019

bors commented Dec 16, 2019

bors commented Dec 16, 2019