Skip to content

[beta] backports - #43114

Merged
bors merged 11 commits into
rust-lang:betafrom
brson:beta-next
Jul 13, 2017
Merged

[beta] backports#43114
bors merged 11 commits into
rust-lang:betafrom
brson:beta-next

Conversation

@brson

@brsonbrson commented Jul 8, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

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

rust-highfive commented Jul 8, 2017

Copy link
Copy Markdown
Contributor

r? @sfackler

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

@rust-highfive

rust-highfive commented Jul 8, 2017

Copy link
Copy Markdown
Contributor

warningWarningwarning

  • 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!

@brsonbrson mentioned this pull request Jul 8, 2017
Closed
@sfackler

sfackler commented Jul 8, 2017

Copy link
Copy Markdown
Member

This should probably include #42991

@durka

durka commented Jul 8, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

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

@carols10centscarols10cents added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 10, 2017
@brson

brson commented Jul 13, 2017

Copy link
Copy Markdown
ContributorAuthor

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

sfackler commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8eb074c has been approved by sfackler

@kennytmkennytm mentioned this pull request Jul 13, 2017
Merged
@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: r-

tidy failure :(

@kennytm

kennytm commented Jul 13, 2017

Copy link
Copy Markdown
Member

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

@Mark-Simulacrum

Mark-Simulacrum commented Jul 13, 2017

Copy link
Copy Markdown
Member

Pacified tidy and pulled in #43198.

@bors r+ p=50

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 1bd5f76 has been approved by Mark-Simulacrum

@Mark-SimulacrumMark-Simulacrum mentioned this pull request Jul 13, 2017
Closed
@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1bd5f760b6ac3e23585761e1d0e85384b8cf162e with merge ed4430fa5aa4f2eaa9691447f37b6e03aeb6d547...

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3c7823a has been approved by alexcrichton

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3c7823a with merge 4cf16477ffd6f70c9164fb8b5cbf920a45c71192...

@alexcrichtonalexcrichton mentioned this pull request Jul 13, 2017
Closed
@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 1d4b2e2 has been approved by brson

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

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

bors added a commit that referenced this pull request Jul 13, 2017
@bors
Auto merge of#43114- brson:beta-next, r=brson
8537f4e
[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.
@brsonbrson mentioned this pull request Jul 13, 2017
Closed
@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Jul 13, 2017•
edited
Loading

Copy link
Copy Markdown
Member

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

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: retry

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 6a47b61 has been approved by alexcrichton

ollie27and others added 11 commits July 13, 2017 13:31
@ollie27@alexcrichton
rustdoc: Don't run Markdown tests twice
15a7d6a
This matches the behaviour for finding tests in Rust files.
@sfackler@alexcrichton
Stabilize Command::envs
15a95aa
Closesrust-lang#38526
@sfackler@alexcrichton
Stabilize cmp::Reverse
d0f7613
Closesrust-lang#40893
@sfackler@alexcrichton
Stabilize OsString::shrink_to_fit
527e718
Closesrust-lang#40421
@sfackler@alexcrichton
Stabilize ThreadId
647df67
Closesrust-lang#21507
@sfackler@alexcrichton
Add a stability marker for core::cmp::Reverse.0
455da0f
Closesrust-lang#43027
@Mark-Simulacrum@alexcrichton
Change language in Travis configuration to shell
9e96c9c
In theory, this will give us more disk space to work with and unblock the queue.
@Mark-Simulacrum@alexcrichton
Remove stabilized library features from book.
0275872
@alexcrichton
Update the cargo submodule
3935d5f
Notably pull in an update to the `jobserver` crate to have Cargo set the
`CARGO_MAKEFLAGS` environment variable instead of the `MAKEFLAGS` environment
variable.
@cuviper@alexcrichton
[beta] Remove rls from the workspace and extended builds
b3a082d
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 rust-lang#42719
@brson@alexcrichton
Bump 1.19 prerelease to .4
9bbf947
@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 9bbf947 has been approved by alexcrichton

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

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

bors added a commit that referenced this pull request Jul 13, 2017
@bors
Auto merge of#43114- brson:beta-next, r=alexcrichton
23542f5
[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

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 9bbf947 into rust-lang:betaJul 13, 2017
@alexcrichton
alexcrichton deleted the beta-next branch July 13, 2017 23:39
@brsonbrson mentioned this pull request Jul 14, 2017
Closed
@kennytmkennytm mentioned this pull request Aug 29, 2017
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@sfacklersfackler

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@brson@rust-highfive@sfackler@durka@bors@alexcrichton@kennytm@Mark-Simulacrum@carols10cents@ollie27@cuviper