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

[beta] Rollup backports #62866

Merged
merged 16 commits into from
Jul 23, 2019
Merged

[beta] Rollup backports #62866

merged 16 commits into from
Jul 23, 2019

Conversation

pietroalbini
Copy link
Member

Cherry picked:

Rolled up:

r? @ghost

goodmanjonathan and others added 16 commits July 18, 2019 19:56
Beta backport of rust-lang#62668.

If the explicitly given type of a `self` parameter fails to parse correctly,
we need to propagate the error rather than dropping it and causing an ICE.
When `rustc` is invoked with the `--print` argument, we don't actually
generate any code (unless it's the `native-static-libs` option). So we
don't need to error our in this case since there's no risk of generating
either LLVM assertions or corrupted binaries.
docutils 0.15, a dependency of awscli, broke our CI since it's not
compatible with Python 2 due to a bug. This pins all the dependencies of
awscli with docutils 0.14, to make sure this kind of regressions doesn't
happen again.
During installation of mingw, at least, the git directories change, so
we need to reset the core.autocrlf config to false.

Once we finish checking out submodules, check that the line endings are
\n and not \r\n.
@pietroalbini
Copy link
Member Author

@bors r+ p=20

@bors
Copy link
Contributor

bors commented Jul 22, 2019

📌 Commit 1d5b47d has been approved by pietroalbini

@bors
Copy link
Contributor

bors commented Jul 22, 2019

🌲 The tree is currently closed for pull requests below priority 1500, 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 Jul 22, 2019
@pietroalbini
Copy link
Member Author

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Jul 22, 2019

⌛ Testing commit 1d5b47d with merge 15279d5096158de1bf4a01d7ec7547af65397886...

@pietroalbini
Copy link
Member Author

@bors retry

@Centril
Copy link
Contributor

Centril commented Jul 22, 2019

@bors p=1501

@bors
Copy link
Contributor

bors commented Jul 22, 2019

⌛ Testing commit 1d5b47d with merge 97789c4...

bors added a commit that referenced this pull request Jul 22, 2019
[beta] Rollup backports

Cherry picked:

* rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380
* Fix ICEs when `Self` is used in type aliases #62417
* Raise the default recursion limit to 128 #62450
* Handle errors during error recovery gracefully #62604
* Correctly break out of recovery loop #62607
* Cancel unemitted diagnostics during error recovery #62666
* ci: pin awscli dependencies #62856
* Ensure that checkout is with \n line endings #62564

Rolled up:

* [beta] Backport #62615 #62793
* [beta] Fix #62660 #62792

r? @ghost
@Mark-Simulacrum
Copy link
Member

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Jul 22, 2019

💥 Test timed out

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 22, 2019
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2019
@pietroalbini
Copy link
Member Author

@bors retry

4hrs timeout

@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 Jul 22, 2019
@Centril Centril closed this Jul 22, 2019
@Centril Centril reopened this Jul 22, 2019
@Centril
Copy link
Contributor

Centril commented Jul 22, 2019

@bors r+ p=50

@bors
Copy link
Contributor

bors commented Jul 22, 2019

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Extend #[must_use] to nested structures #62262

@bors
Copy link
Contributor

bors commented Jul 22, 2019

📌 Commit 1d5b47d has been approved by Centril

@bors
Copy link
Contributor

bors commented Jul 22, 2019

⌛ Testing commit 1d5b47d with merge 61d1607...

bors added a commit that referenced this pull request Jul 22, 2019
[beta] Rollup backports

Cherry picked:

* rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380
* Fix ICEs when `Self` is used in type aliases #62417
* Raise the default recursion limit to 128 #62450
* Handle errors during error recovery gracefully #62604
* Correctly break out of recovery loop #62607
* Cancel unemitted diagnostics during error recovery #62666
* ci: pin awscli dependencies #62856
* Ensure that checkout is with \n line endings #62564

Rolled up:

* [beta] Backport #62615 #62793
* [beta] Fix #62660 #62792

r? @ghost
@bors
Copy link
Contributor

bors commented Jul 23, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 61d1607 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 23, 2019
@bors bors merged commit 1d5b47d into rust-lang:beta Jul 23, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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. rollup A PR which is a rollup 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.

10 participants