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

1.37.0 stable #63498

Merged
merged 4 commits into from
Aug 13, 2019
Merged

1.37.0 stable #63498

merged 4 commits into from
Aug 13, 2019

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Aug 12, 2019

This promotes beta to stable and backports a few PRs:

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 12, 2019
@Mark-Simulacrum
Copy link
Member Author

@rust-lang/compiler @eddyb @oli-obk We need a review for the last commit in this PR (724a150) which is intended as a backport of #62982.

@Mark-Simulacrum
Copy link
Member Author

I am going to approve this PR and land these changes, and if we need to (i.e., the review turns up problems) we should have enough time left to make new stable artifacts.

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Aug 12, 2019

📌 Commit 724a150e763b69ce00678ad5b210027ff2c08393 has been approved by Mark-Simulacrum

@bors 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 Aug 12, 2019
@bors
Copy link
Contributor

bors commented Aug 12, 2019

⌛ Testing commit 724a150e763b69ce00678ad5b210027ff2c08393 with merge 2970c41eab04254b4d8a4ca75e63d2f7f1e8a633...

@bors
Copy link
Contributor

bors commented Aug 12, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job Job38 of your PR failed (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-08-12T19:24:41.5869301Z     Checking rustc_mir v0.0.0 (/checkout/src/librustc_mir)
2019-08-12T19:24:45.2595158Z error[E0614]: type `rustc::mir::Local` cannot be dereferenced
2019-08-12T19:24:45.2596475Z     --> src/librustc_mir/borrow_check/conflict_errors.rs:1118:40
2019-08-12T19:24:45.2597062Z      |
2019-08-12T19:24:45.2597743Z 1118 |             match self.body.local_kind(*local) {
2019-08-12T19:24:45.2598671Z 
2019-08-12T19:24:45.2604989Z error[E0277]: the size for values of type `str` cannot be known at compilation time
2019-08-12T19:24:45.2617232Z     --> src/librustc_mir/borrow_check/conflict_errors.rs:1086:14
2019-08-12T19:24:45.2643607Z      |
2019-08-12T19:24:45.2643607Z      |
2019-08-12T19:24:45.2644547Z 1086 |         let (place_desc, note) = if let Some(place_desc) = opt_place_desc {
2019-08-12T19:24:45.2645237Z      |              ^^^^^^^^^^ doesn't have a size known at compile-time
2019-08-12T19:24:45.2645775Z      |
2019-08-12T19:24:45.2646330Z      = help: the trait `std::marker::Sized` is not implemented for `str`
2019-08-12T19:24:45.2647105Z      = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
2019-08-12T19:24:45.2647795Z      = note: all local variables must have a statically known size
2019-08-12T19:24:45.2649286Z 
2019-08-12T19:24:45.6909781Z     Checking rustc_lint v0.0.0 (/checkout/src/librustc_lint)
2019-08-12T19:24:47.4045503Z     Checking rustc_traits v0.0.0 (/checkout/src/librustc_traits)
2019-08-12T19:24:48.8379748Z     Checking rustc_codegen_utils v0.0.0 (/checkout/src/librustc_codegen_utils)
---
2019-08-12T19:24:52.6054585Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
2019-08-12T19:24:52.6054801Z expected success, got: exit code: 101
2019-08-12T19:24:52.6065389Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2019-08-12T19:24:52.6065518Z Build completed unsuccessfully in 0:06:17
2019-08-12T19:24:53.9378852Z ##[error]Bash exited with code '1'.
2019-08-12T19:24:53.9419259Z ##[section]Starting: Upload CPU usage statistics
2019-08-12T19:24:53.9422749Z ==============================================================================
2019-08-12T19:24:53.9422860Z Task         : Bash
2019-08-12T19:24:53.9422930Z Description  : Run a Bash script on macOS, Linux, or Windows

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 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 Aug 12, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Aug 12, 2019

📌 Commit 0a2bd28 has been approved by Mark-Simulacrum

@bors 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 Aug 12, 2019
@bors
Copy link
Contributor

bors commented Aug 12, 2019

⌛ Testing commit 0a2bd28 with merge 736d3e65f873e8c86e1b1f1d459a73af016bc5b5...

@bors
Copy link
Contributor

bors commented Aug 12, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job Job2 of your PR failed (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.

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 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 Aug 12, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors retry lets hope this is spurious...

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 12, 2019
@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 Aug 12, 2019
@bors
Copy link
Contributor

bors commented Aug 12, 2019

⌛ Testing commit 0a2bd28 with merge dca7d7ef4a52ef75d7294f00a12b1cda546f5398...

@bors
Copy link
Contributor

bors commented Aug 13, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job Job33 of your PR failed (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.

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 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 Aug 13, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Aug 13, 2019

📌 Commit c9be294 has been approved by Mark-Simulacrum

@bors 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 Aug 13, 2019
@bors
Copy link
Contributor

bors commented Aug 13, 2019

⌛ Testing commit c9be294 with merge 2fa8790...

bors added a commit that referenced this pull request Aug 13, 2019
1.37.0 stable

This promotes beta to stable and backports a few PRs:

 - Avoid ICE when referencing desugared local binding in borrow error (#63051)
 - Don't access a static just for its size and alignment (#62982) via 331e09b143aebfcf82dc1f9b69b31ee0083cbf0b
@bors
Copy link
Contributor

bors commented Aug 13, 2019

💥 Test timed out

@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 Aug 13, 2019
@estebank
Copy link
Contributor

@bors retry

@bors 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 Aug 13, 2019
@bors
Copy link
Contributor

bors commented Aug 13, 2019

⌛ Testing commit c9be294 with merge eae3437...

bors added a commit that referenced this pull request Aug 13, 2019
1.37.0 stable

This promotes beta to stable and backports a few PRs:

 - Avoid ICE when referencing desugared local binding in borrow error (#63051)
 - Don't access a static just for its size and alignment (#62982) via 331e09b143aebfcf82dc1f9b69b31ee0083cbf0b

# Log the date, even on failure. Attempting to debug SSL certificate errors.
- bash: date
continueOnError: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure this won't trigger: continueOnError tells Azure Pipelines to ignore this task failing, but condition: succeeded() is still implied. You should also add condition: true.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My fix is #63511.

@bors
Copy link
Contributor

bors commented Aug 13, 2019

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing eae3437 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 13, 2019
@bors bors merged commit c9be294 into rust-lang:stable Aug 13, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the stable-next branch August 13, 2019 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants