Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 4 pull requests #67319

Closed
wants to merge 11 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 15, 2019

Successful merges:

Failed merges:

r? @ghost

Bryan Donlan and others added 11 commits November 21, 2019 18:33
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`).
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)
…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
@Centril
Copy link
Contributor Author

Centril commented Dec 15, 2019

@bors r+ p=2000 rollup=never

@bors
Copy link
Contributor

bors commented Dec 15, 2019

📌 Commit 0a2e6f1 has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 15, 2019

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

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

bors commented Dec 15, 2019

⌛ Testing commit 0a2e6f1 with merge ad1fcfd45e93d7c10f27808ca89803e839d77e85...

@rust-highfive
Copy link
Collaborator

The job i686-msvc-1 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-15T12:26:15.2753950Z 
2019-12-15T12:26:15.2754513Z 
2019-12-15T12:26:15.2754982Z 
2019-12-15T12:26:15.2755577Z 
2019-12-15T12:26:15.2755775Z  - #65778 (Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}`)
2019-12-15T12:26:15.2756060Z  - #67206 (Update cargo, books)
2019-12-15T12:26:15.2756213Z  - #67285 (Indicate origin of where type parameter for uninferred types )
2019-12-15T12:26:15.2757496Z  - #67317 (fix type_name_of_val doc comment)
2019-12-15T12:26:15.2762316Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
2019-12-15T12:26:15.2762987Z AGENT_DISABLELOGPLUGIN_TESTRESULTLOGPLUGIN=true
2019-12-15T12:26:15.2763233Z AGENT_HOMEDIRECTORY=C:\agents\2.163.1
2019-12-15T12:26:15.2763433Z AGENT_ID=520
---
2019-12-15T15:28:24.8186850Z    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-12-15T15:28:24.8186941Z    |
2019-12-15T15:28:24.8187078Z    = note: perhaps that crate needs to be recompiled?
2019-12-15T15:28:24.8187216Z    = note: the following crate versions were found:
2019-12-15T15:28:24.8187399Z            crate `rustc_plugin_impl`: \\?\C:\MORE_SPACE\i686-pc-windows-msvc\stage2\lib\rustlib\i686-pc-windows-msvc\lib\librustc_plugin_impl-ab0921028d5d8ffa.rlib
2019-12-15T15:28:24.8187602Z            crate `rustc_driver`: \\?\C:\MORE_SPACE\i686-pc-windows-msvc\stage2\lib\rustlib\i686-pc-windows-msvc\lib\rustc_driver-79b9dd467afe5b7b.dll
2019-12-15T15:28:24.8187797Z error: aborting due to previous error
2019-12-15T15:28:24.8187859Z 
2019-12-15T15:28:24.8242040Z [RUSTC-TIMING] rustdoc test:false 0.338
2019-12-15T15:28:24.8260193Z error: could not compile `rustdoc`.
2019-12-15T15:28:24.8260193Z error: could not compile `rustdoc`.
2019-12-15T15:28:24.8272660Z warning: build failed, waiting for other jobs to finish...
2019-12-15T15:28:27.9085634Z [RUSTC-TIMING] serde_json test:false 5.696
2019-12-15T15:28:27.9254930Z error: build failed
2019-12-15T15:28:27.9289718Z 
2019-12-15T15:28:27.9289906Z 
2019-12-15T15:28:27.9290110Z command did not execute successfully: "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage0\\bin\\cargo.exe" "test" "-Zconfig-profile" "--target" "i686-pc-windows-msvc" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--manifest-path" "D:\\a\\1\\s\\src/tools/rustdoc\\Cargo.toml" "-p" "rustdoc:0.0.0" "--"
2019-12-15T15:28:27.9290739Z 
2019-12-15T15:28:27.9290771Z 
2019-12-15T15:28:27.9290771Z 
2019-12-15T15:28:28.0353013Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test --exclude src/test/ui --exclude src/test/compile-fail --exclude src/tools/linkchecker
2019-12-15T15:28:28.0353178Z Build completed unsuccessfully in 2:50:30
2019-12-15T15:28:28.0941413Z make: *** [Makefile:80: ci-subset-1] Error 1
2019-12-15T15:28:28.1628256Z   local time: Sun Dec 15 15:28:28 CUT 2019
2019-12-15T15:28:28.5592478Z   network time: Sun, 15 Dec 2019 15:28:28 GMT
2019-12-15T15:28:28.5613990Z == end clock drift check ==
2019-12-15T15:28:28.6413209Z 
2019-12-15T15:28:28.6413209Z 
2019-12-15T15:28:29.0555280Z ##[error]Bash exited with code '2'.
2019-12-15T15:28:29.1323271Z ##[section]Starting: Checkout
2019-12-15T15:28:29.2378711Z ==============================================================================
2019-12-15T15:28:29.2378859Z Task         : Get sources
2019-12-15T15:28:29.2378951Z 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
Copy link
Contributor

bors commented Dec 15, 2019

💔 Test failed - checks-azure

@bors 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 Centril closed this Dec 15, 2019
@Centril Centril deleted the rollup-drr1r1r branch December 15, 2019 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants