Update Cargo #64536

Aaron1011 · 2019-09-17T01:13:08Z

This pulls in rust-lang/cargo#7159, which
ensures that documenting proc macros works correctly.

rust-highfive · 2019-09-17T01:13:18Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2019-09-17T01:13:19Z

⚠️ Warning ⚠️

These commits modify submodules.

rust-highfive · 2019-09-17T01:37:27Z

The job LinuxTools 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-09-17T01:26:52.7740256Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-17T01:26:52.7999736Z ##[command]git config gc.auto 0
2019-09-17T01:26:52.8063539Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-17T01:26:52.8122624Z ##[command]git config --get-all http.proxy
2019-09-17T01:26:52.8295658Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64536/merge:refs/remotes/pull/64536/merge
---
2019-09-17T01:30:16.6168700Z ############################################################              83.8%
2019-09-17T01:30:16.6171867Z ######################################################################## 100.0%
2019-09-17T01:30:20.6200905Z extracting /checkout/obj/build/cache/2019-08-13/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
2019-09-17T01:30:20.7126574Z     Updating crates.io index
2019-09-17T01:30:57.4054094Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-09-17T01:30:57.4146131Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-09-17T01:30:57.4160840Z Makefile:67: recipe for target 'prepare' failed
2019-09-17T01:30:57.4161135Z make: *** [prepare] Error 1
2019-09-17T01:30:58.4185019Z Command failed. Attempt 2/5:
2019-09-17T01:30:58.4185019Z Command failed. Attempt 2/5:
2019-09-17T01:30:58.6340431Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-09-17T01:30:58.6362318Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-09-17T01:30:58.6408664Z Makefile:67: recipe for target 'prepare' failed
2019-09-17T01:30:58.6408825Z make: *** [prepare] Error 1
2019-09-17T01:31:00.6423535Z Command failed. Attempt 3/5:
2019-09-17T01:31:00.6423535Z Command failed. Attempt 3/5:
2019-09-17T01:31:00.8564690Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-09-17T01:31:00.8578090Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-09-17T01:31:00.8645414Z Makefile:67: recipe for target 'prepare' failed
2019-09-17T01:31:00.8651778Z make: *** [prepare] Error 1
2019-09-17T01:31:03.8663857Z Command failed. Attempt 4/5:
2019-09-17T01:31:03.8663857Z Command failed. Attempt 4/5:
2019-09-17T01:31:04.0823622Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-09-17T01:31:04.0836833Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-09-17T01:31:04.0884061Z make: *** [prepare] Error 1
2019-09-17T01:31:04.0887293Z Makefile:67: recipe for target 'prepare' failed
2019-09-17T01:31:08.0911180Z Command failed. Attempt 5/5:
2019-09-17T01:31:08.0911180Z Command failed. Attempt 5/5:
2019-09-17T01:31:08.3085791Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-09-17T01:31:08.3103984Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-09-17T01:31:08.3149860Z make: *** [prepare] Error 1
2019-09-17T01:31:08.3156564Z Makefile:67: recipe for target 'prepare' failed
2019-09-17T01:31:08.3156676Z The command has failed after 5 attempts.
2019-09-17T01:31:08.3156719Z == clock drift check ==
2019-09-17T01:31:08.3156719Z == clock drift check ==
2019-09-17T01:31:08.3164809Z   local time: Tue Sep 17 01:31:08 UTC 2019
2019-09-17T01:31:08.4042213Z   network time: Tue, 17 Sep 2019 01:31:08 GMT
2019-09-17T01:31:08.4047502Z == end clock drift check ==
2019-09-17T01:31:09.5155085Z ##[error]Bash exited with code '1'.
2019-09-17T01:31:09.5190640Z ##[section]Starting: Checkout
2019-09-17T01:31:09.5192513Z ==============================================================================
2019-09-17T01:31:09.5192588Z Task         : Get sources
2019-09-17T01:31:09.5192636Z 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)

ehuss · 2019-09-17T17:25:37Z

Can you update this to the latest master? There are some fixes I'd like to get in for 1.39.

Aaron1011 · 2019-09-17T20:09:41Z

@ehuss Updated

ehuss · 2019-09-17T21:41:33Z

Thanks!

@bors r+

bors · 2019-09-17T21:41:34Z

📌 Commit 7419050 has been approved by ehuss

Update Cargo This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

tmandry · 2019-09-18T04:24:20Z

Failed in #64567 (EDIT: github completion is a bear)
@bors r-

Aaron1011 · 2019-09-18T21:12:14Z

Blocked on rust-lang/rls#1554

ehuss · 2019-09-19T00:32:07Z

Oh, sorry, that's not quite the right approach to solve that problem. That PR won't have any effect, because rust-lang/rust does not use that version of cargo in rls. There is a patch override so it always uses the version here.

I posted rust-lang/cargo#7385 with a fix. We just have to be careful to use the same set of features across dependencies.

ehuss · 2019-09-19T01:41:32Z

OK, 7385 has been merged, so you should be able to update the submodule, update Cargo.lock and apply this patch:

diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index 930279c0ca..bafddee99f 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -62,7 +62,7 @@ crossbeam-utils = { version = "0.6.5", features = ["nightly"] }
 serde = { version = "1.0.82", features = ['derive'] }
 serde_json = { version = "1.0.31", features = ["raw_value"] }
 smallvec = { version = "0.6", features = ['union', 'may_dangle'] }
-
+url = { version = "2.0", features = ['serde'] }

 [target.'cfg(not(windows))'.dependencies]
 openssl = { version = "0.10.12", optional = true }

That way, the tools should have the same features.

This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

Aaron1011 · 2019-09-19T01:54:34Z

@ehuss Updated

ehuss · 2019-09-19T01:57:12Z

Thanks!
@bors r+

bors · 2019-09-19T01:57:13Z

📌 Commit d440e13 has been approved by ehuss

Update Cargo This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

@ghost

Rollup of 5 pull requests Successful merges: - #63630 (Update installed compiler dependencies) - #64536 (Update Cargo) - #64554 (Polonius: more `ui` test suite fixes) - #64566 (A more generic interface for dataflow analysis) - #64591 (Fix a minor grammar nit, update UI tests) Failed merges: r? @ghost

bors · 2019-09-19T06:53:44Z

⌛ Testing commit d440e13 with merge 19d0703...

Now that rust-lang/rust#64536 has landed, all of the bugs with proc macro documentation have now been fixed (currently only on the latest nightly). We can now use `#[doc(inline)]` on proc macro imports, which works just like any other import.

98: Properly inline documentation and use intra-crate lints r=taiki-e a=Aaron1011 Now that rust-lang/rust#64536 has landed, all of the bugs with proc macro documentation have now been fixed (currently only on the latest nightly). We can now use `#[doc(inline)]` on proc macro imports, which works just like any other import. Co-authored-by: Aaron Hill <aa1ronham@gmail.com>

rust-highfive assigned nikomatsakis Sep 17, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2019

ehuss assigned ehuss and unassigned nikomatsakis Sep 17, 2019

Aaron1011 force-pushed the cargo-crate-type branch from 774999c to 7419050 Compare September 17, 2019 20:09

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 Sep 17, 2019

tmandry added a commit to tmandry/rust that referenced this pull request Sep 18, 2019

Rollup merge of rust-lang#64536 - Aaron1011:cargo-crate-type, r=ehuss

4d94422

Update Cargo This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

tmandry mentioned this pull request Sep 18, 2019

Rollup of 4 pull requests #64567

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 18, 2019

Update Cargo

d440e13

This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

Aaron1011 force-pushed the cargo-crate-type branch from 7419050 to d440e13 Compare September 19, 2019 01:54

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 19, 2019

Centril added a commit to Centril/rust that referenced this pull request Sep 19, 2019

Rollup merge of rust-lang#64536 - Aaron1011:cargo-crate-type, r=ehuss

11a0b96

Update Cargo This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

Centril mentioned this pull request Sep 19, 2019

Rollup of 5 pull requests #64598

Merged

bors merged commit d440e13 into rust-lang:master Sep 19, 2019

Xanewok mentioned this pull request Sep 19, 2019

Bump Cargo dependency to latest master rust-lang/rls#1554

Merged

Aaron1011 mentioned this pull request Sep 20, 2019

Properly inline documentation and use intra-crate lints taiki-e/pin-project#98

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Cargo #64536

Update Cargo #64536

Aaron1011 commented Sep 17, 2019

rust-highfive commented Sep 17, 2019

rust-highfive commented Sep 17, 2019

rust-highfive commented Sep 17, 2019

ehuss commented Sep 17, 2019

Aaron1011 commented Sep 17, 2019

ehuss commented Sep 17, 2019

bors commented Sep 17, 2019

tmandry commented Sep 18, 2019 •

edited

Loading

Aaron1011 commented Sep 18, 2019

ehuss commented Sep 19, 2019

ehuss commented Sep 19, 2019

Aaron1011 commented Sep 19, 2019

ehuss commented Sep 19, 2019

bors commented Sep 19, 2019

bors commented Sep 19, 2019

Update Cargo #64536

Update Cargo #64536

Conversation

Aaron1011 commented Sep 17, 2019

rust-highfive commented Sep 17, 2019

rust-highfive commented Sep 17, 2019

rust-highfive commented Sep 17, 2019

ehuss commented Sep 17, 2019

Aaron1011 commented Sep 17, 2019

ehuss commented Sep 17, 2019

bors commented Sep 17, 2019

tmandry commented Sep 18, 2019 • edited Loading

Aaron1011 commented Sep 18, 2019

ehuss commented Sep 19, 2019

ehuss commented Sep 19, 2019

Aaron1011 commented Sep 19, 2019

ehuss commented Sep 19, 2019

bors commented Sep 19, 2019

bors commented Sep 19, 2019

tmandry commented Sep 18, 2019 •

edited

Loading