Rollup of 6 pull requests #67326

Centril · 2019-12-15T15:41:55Z

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)
Update cargo, books #67206 (Update cargo, books)
Indicate origin of where type parameter for uninferred types #67285 (Indicate origin of where type parameter for uninferred types )
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)

Failed merges:

@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

Update cargo, books Update nomicon, cargo, reference, book, rust-by-example, embedded-book ## nomicon 2 commits in 041c46e692a2592853aeca132c8dfe8eb5a79a9e..8be35b201f9cf0a4c3fcc96c83ac21671dcf3112 2019-11-20 16:46:45 +0100 to 2019-12-01 13:02:12 -0500 - Update unwinding.md - ci: remove needless rust-docs component ## cargo 15 commits in 626f0f40efd32e6b3dbade50cd53fdfaa08446ba..5a139f7e6d67fd8a416a3f19d8e01581d24c0333 2019-12-03 16:53:04 +0000 to 2019-12-10 20:17:50 +0000 - Bump cargo-platform version. (rust-lang/cargo#7693) - Add a test for `cargo locate-project` (rust-lang/cargo#7690) - Emit error on [target.'cfg(debug_assertions)'.dependencies] and similar (rust-lang/cargo#7660) - Update the layout of `Cargo Commands` in doc (rust-lang/cargo#7687) - Features and dependencies can't have the same name (rust-lang/cargo#7682) - Fix some typos in doc (rust-lang/cargo#7672) - Add test for `NAME` environment variable when `cargo new` (rust-lang/cargo#7667) - Add test for `GIT_COMMITTER_EMAIL` when `cargo new` (rust-lang/cargo#7666) - document support for Bitbucket Pipelines badges (rust-lang/cargo#7663) - Add cargo-vendor to the list of cargo commands in doc (rust-lang/cargo#7659) - Fix typo in section 'Caching the Cargo home in CI' (rust-lang/cargo#7661) - Docs: Add an appendix on git authentication. (rust-lang/cargo#7658) - Remove --offline empty index error. (rust-lang/cargo#7655) - Change the link destination of cargo book contribution (rust-lang/cargo#7657) - Add a --offline hint. (rust-lang/cargo#7654) ## reference 2 commits in 9e843ae..787e8d8 2019-11-24 17:44:04 +0100 to 2019-12-10 10:01:29 -0800 - Update for visibility syntax changes. (rust-lang/reference#722) - document `bind_by_move_pattern_guards` (rust-lang/reference#720) ## book 2 commits in 81ebaa2a3f88d4d106516c489682e64cacba4f60..ef8bb568035ded8ddfa30a9309026638cc3c8136 2019-11-15 08:30:04 -0800 to 2019-11-28 11:00:04 -0600 - Remove optional commas from match arms in ch18-03 (rust-lang/book#2176) - Remove call_box() from ch20-03 (rust-lang/book#2177) ## rust-by-example 1 commits in 4835e025826729827a94fdeb7cb85fed288d08bb..b7ac1bc76b7d02a43c83b3a931d226f708aa1ff4 2019-11-14 09:20:43 -0300 to 2019-12-02 11:38:43 -0300 - Make TryFrom & TryInto example editable (rust-lang/rust-by-example#1297) ## embedded-book 1 commits in 5ca585c4a7552efb546e7681c3de0712f4ae4fdc..c26234930282210849256e4ecab925f0f2daf3be 2019-08-27 13:39:14 +0000 to 2019-12-07 17:25:11 +0000 - Fix `impl Gpio` -> `impl GpioConfig` (rust-embedded/book#216)

@estebank

…type-parameter, r=estebank Indicate origin of where type parameter for uninferred types Based on rust-lang#65951 (which is not merge yet), fixes rust-lang#67277. This PR improves a little the diagnostic for code like: ``` async fn foo() { bar().await; } async fn bar<T>() -> () {} ``` by showing: ``` error[E0698]: type inside `async fn` body must be known in this context --> unresolved_type_param.rs:9:5 | 9 | bar().await; | ^^^ cannot infer type for type parameter `T` declared on the function `bar` | ... ``` (The ``` declared on the function `bar` ``` part is new) A small side note: `Vec` and `slice` seem to resist this change, because querying `item_name()` panics, and `get_opt_name()` returns `None`. r? @estebank

fix type_name_of_val doc comment .

@matthewjasper

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

Centril · 2019-12-15T15:42:17Z

@bors r+ p=6 rollup=never

bors · 2019-12-15T15:42:19Z

📌 Commit 6b0d4b4 has been approved by Centril

bors · 2019-12-15T15:42:20Z

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

Centril · 2019-12-15T15:42:32Z

@bors p=2000

bors · 2019-12-15T15:42:44Z

⌛ Testing commit 6b0d4b4 with merge 33d5875...

@ghost

Rollup of 6 pull requests Successful merges: - #65778 (Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}`) - #66570 (stabilize Result::map_or) - #67206 (Update cargo, books) - #67285 (Indicate origin of where type parameter for uninferred types ) - #67317 (fix type_name_of_val doc comment) - #67324 (Fix repetition in matches/mod.rs) Failed merges: r? @ghost

rust-highfive · 2019-12-15T18:09:14Z

The job x86_64-gnu-tools of 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-15T18:03:39.3524067Z +For more information about this error, try `rustc --explain E0658`.
2019-12-15T18:03:39.3524167Z +
2019-12-15T18:03:39.3524205Z 
2019-12-15T18:03:39.3524291Z The actual stderr differed from the expected stderr.
2019-12-15T18:03:39.3524594Z Actual stderr saved to /tmp/compiletestltYAXz/async-fn.stderr
2019-12-15T18:03:39.3524705Z To update references, run this command from build directory:
2019-12-15T18:03:39.3525152Z tests/run-pass/update-references.sh '/tmp/compiletestltYAXz' 'async-fn.rs'
2019-12-15T18:03:39.3525474Z error: 1 errors occurred comparing output.
2019-12-15T18:03:39.3533960Z status: exit code: 1
2019-12-15T18:03:39.3533960Z status: exit code: 1
2019-12-15T18:03:39.3534947Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/async-fn.rs" "-L" "/tmp/compiletestltYAXz" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestltYAXz/async-fn.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestltYAXz/async-fn.stage-id.aux" "-A" "unused"
2019-12-15T18:03:39.3535462Z ------------------------------------------
2019-12-15T18:03:39.3535515Z 
2019-12-15T18:03:39.3535772Z ------------------------------------------
2019-12-15T18:03:39.3535851Z stderr:
---
2019-12-15T18:03:45.5816905Z +For more information about this error, try `rustc --explain E0658`.
2019-12-15T18:03:45.5817156Z +
2019-12-15T18:03:45.5817305Z 
2019-12-15T18:03:45.5817681Z The actual stderr differed from the expected stderr.
2019-12-15T18:03:45.5817901Z Actual stderr saved to /tmp/compiletestltYAXz/generator.stderr
2019-12-15T18:03:45.5818131Z To update references, run this command from build directory:
2019-12-15T18:03:45.5818645Z tests/run-pass/update-references.sh '/tmp/compiletestltYAXz' 'generator.rs'
2019-12-15T18:03:45.5819085Z error: 1 errors occurred comparing output.
2019-12-15T18:03:45.5819294Z status: exit code: 1
2019-12-15T18:03:45.5819294Z status: exit code: 1
2019-12-15T18:03:45.5820289Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/generator.rs" "-L" "/tmp/compiletestltYAXz" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestltYAXz/generator.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestltYAXz/generator.stage-id.aux" "-A" "unused"
2019-12-15T18:03:45.5821136Z ------------------------------------------
2019-12-15T18:03:45.5821376Z 
2019-12-15T18:03:45.5821803Z ------------------------------------------
2019-12-15T18:03:45.5822059Z stderr:
---
2019-12-15T18:03:50.9901912Z +For more information about this error, try `rustc --explain E0658`.
2019-12-15T18:03:50.9902529Z +
2019-12-15T18:03:50.9902590Z 
2019-12-15T18:03:50.9902704Z The actual stderr differed from the expected stderr.
2019-12-15T18:03:50.9903204Z Actual stderr saved to /tmp/compiletestltYAXz/loop-break-value.stderr
2019-12-15T18:03:50.9903325Z To update references, run this command from build directory:
2019-12-15T18:03:50.9903652Z tests/run-pass/update-references.sh '/tmp/compiletestltYAXz' 'loop-break-value.rs'
2019-12-15T18:03:50.9903801Z error: 1 errors occurred comparing output.
2019-12-15T18:03:50.9903888Z status: exit code: 1
2019-12-15T18:03:50.9903888Z status: exit code: 1
2019-12-15T18:03:50.9904812Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/loop-break-value.rs" "-L" "/tmp/compiletestltYAXz" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestltYAXz/loop-break-value.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestltYAXz/loop-break-value.stage-id.aux" "-A" "unused"
2019-12-15T18:03:50.9905442Z ------------------------------------------
2019-12-15T18:03:50.9905494Z 
2019-12-15T18:03:50.9905743Z ------------------------------------------
2019-12-15T18:03:50.9905816Z stderr:
---
2019-12-15T18:03:52.8345582Z +For more information about this error, try `rustc --explain E0658`.
2019-12-15T18:03:52.8345676Z  
2019-12-15T18:03:52.8345712Z 
2019-12-15T18:03:52.8345792Z The actual stderr differed from the expected stderr.
2019-12-15T18:03:52.8345878Z Actual stderr saved to /tmp/compiletestltYAXz/panic/catch_panic.stderr
2019-12-15T18:03:52.8345983Z To update references, run this command from build directory:
2019-12-15T18:03:52.8346292Z tests/run-pass/update-references.sh '/tmp/compiletestltYAXz' 'panic/catch_panic.rs'
2019-12-15T18:03:52.8346528Z error: 1 errors occurred comparing output.
2019-12-15T18:03:52.8346614Z status: exit code: 1
2019-12-15T18:03:52.8346614Z status: exit code: 1
2019-12-15T18:03:52.8347489Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/panic/catch_panic.rs" "-L" "/tmp/compiletestltYAXz" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestltYAXz/panic/catch_panic.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestltYAXz/panic/catch_panic.stage-id.aux" "-A" "unused"
2019-12-15T18:03:52.8347969Z ------------------------------------------
2019-12-15T18:03:52.8348019Z 
2019-12-15T18:03:52.8348271Z ------------------------------------------
2019-12-15T18:03:52.8348356Z stderr:
---
2019-12-15T18:04:01.5087164Z Verifying status of miri...
2019-12-15T18:04:01.5087389Z Verifying status of embedded-book...
2019-12-15T18:04:01.5087686Z This PR updated 'src/doc/embedded-book', verifying if status is 'test-pass'...
2019-12-15T18:04:01.5087925Z Verifying status of rustc-guide...
2019-12-15T18:04:01.5088220Z error: Tool `rls` should be test-pass but is test-fail during beta week.
2019-12-15T18:04:01.5088689Z Build completed unsuccessfully in 0:00:01
2019-12-15T18:04:01.5128563Z == clock drift check ==
2019-12-15T18:04:01.5139197Z   local time: Sun Dec 15 18:04:01 UTC 2019
2019-12-15T18:04:01.5432355Z   network time: Sun, 15 Dec 2019 18:04:01 GMT
2019-12-15T18:04:01.5432355Z   network time: Sun, 15 Dec 2019 18:04:01 GMT
2019-12-15T18:04:01.5432480Z == end clock drift check ==
2019-12-15T18:04:02.3771641Z 
2019-12-15T18:04:02.3862296Z ##[error]Bash exited with code '1'.
2019-12-15T18:04:02.3904444Z ##[section]Starting: Checkout
2019-12-15T18:04:02.3906687Z ==============================================================================
2019-12-15T18:04:02.3906793Z Task         : Get sources
2019-12-15T18:04:02.3906885Z 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-15T18:09:19Z

💔 Test failed - checks-azure

Bryan Donlan and others added 16 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

stabilize Result::map_or

8cae411

make use of Result::map_or

93438fd

Indicate origin of where type parameter for uninferred types

8a4632d

Update cargo, books

e5d39ee

Update cargo

5141c48

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

9778e03

fix doc comment

e28153e

Fix repetition in matches/mod.rs

8a5969d

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

c305876

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

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

e306af8

fix type_name_of_val doc comment .

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

6b0d4b4

…matthewjasper Fix repetition in matches/mod.rs 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 15, 2019

Centril added the rollup A PR which is a rollup label Dec 15, 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 15, 2019

Centril closed this Dec 16, 2019

Centril deleted the rollup-sdv2jlj branch December 16, 2019 04:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #67326

Rollup of 6 pull requests #67326

Centril commented Dec 15, 2019

Centril commented Dec 15, 2019

bors commented Dec 15, 2019

bors commented Dec 15, 2019

Centril commented Dec 15, 2019

bors commented Dec 15, 2019

rust-highfive commented Dec 15, 2019

bors commented Dec 15, 2019

Rollup of 6 pull requests #67326

Rollup of 6 pull requests #67326

Conversation

Centril commented Dec 15, 2019

Centril commented Dec 15, 2019

bors commented Dec 15, 2019

bors commented Dec 15, 2019

Centril commented Dec 15, 2019

bors commented Dec 15, 2019

rust-highfive commented Dec 15, 2019

bors commented Dec 15, 2019