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] backports #43114

Merged
merged 11 commits into from Jul 13, 2017

Conversation

Projects
None yet
@brson
Copy link
Contributor

brson commented Jul 8, 2017

The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.

Still testing locally.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jul 8, 2017

r? @sfackler

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

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jul 8, 2017

warning Warning 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!
@sfackler

This comment has been minimized.

Copy link
Member

sfackler commented Jul 8, 2017

This should probably include #42991

@durka

This comment has been minimized.

Copy link
Contributor

durka commented Jul 8, 2017

@sfackler you also said at #42991 you were going to un-revert the Bounds move, but that didn't happen, should it?

@brson brson force-pushed the brson:beta-next branch from 5aa74c7 to 8eb074c Jul 13, 2017

@brson

This comment has been minimized.

Copy link
Contributor Author

brson commented Jul 13, 2017

Instead of picking the revert, I just removed the original pick, which was unclean and didn't build. @sfackler does this look right now?

@sfackler

This comment has been minimized.

Copy link
Member

sfackler commented Jul 13, 2017

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 8eb074c has been approved by sfackler

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jul 13, 2017

@bors: r-

tidy failure :(

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Jul 13, 2017

Please consider including #43198 as well, otherwise the Android CI will not pass.

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

Mark-Simulacrum commented Jul 13, 2017

Pacified tidy and pulled in #43198.

@bors r+ p=50

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 1bd5f76 has been approved by Mark-Simulacrum

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

⌛️ Testing commit 1bd5f76 with merge ed4430f...

bors added a commit that referenced this pull request Jul 13, 2017

Auto merge of #43114 - brson:beta-next, r=Mark-Simulacrum
[beta] backports

- #43068
- #43043
- #42745

The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.

Still testing locally.
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

💔 Test failed - status-travis

@alexcrichton alexcrichton force-pushed the brson:beta-next branch from 1bd5f76 to 3c7823a Jul 13, 2017

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jul 13, 2017

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 3c7823a has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

⌛️ Testing commit 3c7823a with merge 4cf1647...

bors added a commit that referenced this pull request Jul 13, 2017

Auto merge of #43114 - brson:beta-next, r=alexcrichton
[beta] backports

- #43068
- #43043
- #42745

The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.

Still testing locally.
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

💔 Test failed - status-appveyor

@alexcrichton alexcrichton force-pushed the brson:beta-next branch from 3c7823a to a337359 Jul 13, 2017

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jul 13, 2017

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 1d4b2e2 has been approved by brson

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

⌛️ Testing commit 1d4b2e2 with merge 8537f4e...

bors added a commit that referenced this pull request Jul 13, 2017

Auto merge of #43114 - brson:beta-next, r=brson
[beta] backports

- #43068
- #43043
- #42745

The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.

Still testing locally.
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

💔 Test failed - status-travis

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Jul 13, 2017

dist-mips-linux failed to deploy.

Installing deploy dependencies
ERROR:  Could not find a valid gem 'aws-sdk-core' (= 2.10.11) in any repository

(2.10.11 is released today so probably Travis's gem repository is not up to date. Spurious.)

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jul 13, 2017

@bors: retry

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jul 13, 2017

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 6a47b61 has been approved by alexcrichton

sfackler and others added some commits Jun 8, 2017

rustdoc: Don't run Markdown tests twice
This matches the behaviour for finding tests in Rust files.
Change language in Travis configuration to shell
In theory, this will give us more disk space to work with and unblock the queue.
[beta] Remove rls from the workspace and extended builds
Its git dependencies don't work when building with vendored crates,
so for now it will just be removed from the workspace and disabled in
the rustbuild rules.

cc #42719
Update the `cargo` submodule
Notably pull in an update to the `jobserver` crate to have Cargo set the
`CARGO_MAKEFLAGS` environment variable instead of the `MAKEFLAGS` environment
variable.

@alexcrichton alexcrichton force-pushed the brson:beta-next branch from 6a47b61 to 9bbf947 Jul 13, 2017

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jul 13, 2017

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 9bbf947 has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

⌛️ Testing commit 9bbf947 with merge 23542f5...

bors added a commit that referenced this pull request Jul 13, 2017

Auto merge of #43114 - brson:beta-next, r=alexcrichton
[beta] backports

- #43068
- #43043
- #42745

The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.

Still testing locally.
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 13, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 23542f5 to beta...

@bors bors merged commit 9bbf947 into rust-lang:beta Jul 13, 2017

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
homu Test successful
Details

@alexcrichton alexcrichton deleted the brson:beta-next branch Jul 13, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.