Prepare beta 1.40.0

[pietroalbini]

cc @Mark-Simulacrum

[rust-highfive]

r? @alexcrichton

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

[rust-highfive]

⚠️ Warning ⚠️

• Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

[pietroalbini]

r? @pietroalbini

@bors r+ p=1000

[bors]

📌 Commit 22f4fa7 has been approved by pietroalbini

[pietroalbini]

@bors rollup=never

[bors]

⌛ Testing commit 22f4fa7 with merge 648d04c697257e2e8579aef3cf8af3c4fc746ab5...

[rust-highfive]

The job mingw-check 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-11-05T09:24:19.7721358Z     Checking crossbeam-deque v0.7.1
2019-11-05T09:24:20.6075824Z     Checking rustc-rayon v0.3.0
2019-11-05T09:24:20.9450406Z     Checking tempfile v3.1.0
2019-11-05T09:24:23.5808677Z     Checking rustdoc v0.0.0 (/checkout/src/librustdoc)
2019-11-05T09:24:23.7608155Z error[E0523]: found two different crates with name `bitflags` that are not distinguished by differing `-C metadata`. This will result in symbol conflicts between the two.
2019-11-05T09:24:23.7608965Z    |
2019-11-05T09:24:23.7608965Z    |
2019-11-05T09:24:23.7609267Z 36 | use pulldown_cmark::{html, CowStr, Event, Options, Parser, Tag};
2019-11-05T09:24:23.7609777Z 
2019-11-05T09:24:23.7792254Z error: aborting due to previous error
2019-11-05T09:24:23.7792410Z 
2019-11-05T09:24:23.7893752Z error: could not compile `rustdoc`.
---
2019-11-05T09:24:23.8006521Z   local time: Tue Nov  5 09:24:23 UTC 2019
2019-11-05T09:24:23.8867684Z   network time: Tue, 05 Nov 2019 09:24:23 GMT
2019-11-05T09:24:23.8872164Z == end clock drift check ==
2019-11-05T09:24:25.5415420Z 
2019-11-05T09:24:25.5521952Z ##[error]Bash exited with code '1'.
2019-11-05T09:24:25.5563291Z ##[section]Starting: Checkout
2019-11-05T09:24:25.5565297Z ==============================================================================
2019-11-05T09:24:25.5565395Z Task         : Get sources
2019-11-05T09:24:25.5565481Z 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]

💔 Test failed - checks-azure

[Mark-Simulacrum]

@alexcrichton -- any thoughts on a good approach to resolving this failure? I suspect personally that we might be conflicting with the bootstrap bitflags, but not sure - I'm not sure why we're only seeing this in this PR (i.e., how master was working)

[alexcrichton]

I've got no idea why this is only on beta and not on master. This fixes it though:

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 2748903f2d4..de4e6b56459 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -886,6 +886,7 @@ impl<'a> Builder<'a> {
         // things still build right, please do!
         match mode {
             Mode::Std => metadata.push_str("std"),
+            Mode::ToolRustc => metadata.push_str("tool-rustc"),
             _ => {},
         }
         cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);

I've got no idea why it fixes it though.

[Mark-Simulacrum]

@bors r+

Pushed up the fix suggested by @alexcrichton along with a comment that proposes one theory for why it's a fix -- though presumably an incomplete one, as it wouldn't explain different behavior between beta and master (hopefully).

[bors]

📌 Commit 73369f3 has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit 73369f3 with merge 76b4053...

[bors]

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 76b4053 to beta...

[Keruspe]

FWIW, wrt the rustdoc build fix: 1.38.0 can build 1.39.0 just fine, but 1.39.0 cannot build itself without backporting the patch.