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.

Sign up for GitHub

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

Jump to bottom

[beta] backports #43114

Merged
merged 11 commits into from
Jul 13, 2017
Merged

[beta] backports #43114

merged 11 commits into from
Jul 13, 2017

Conversation

brson
Copy link
Contributor

@brson brson commented Jul 8, 2017 •
edited
Loading

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
Copy link
Collaborator

r? @sfackler

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

@rust-highfive
Copy link
Collaborator

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!

@brson brson mentioned this pull request Jul 8, 2017
Closed
@sfackler
Copy link
Member

sfackler commented Jul 8, 2017

This should probably include #42991

@durka
Copy link
Contributor

durka commented Jul 8, 2017 •
edited
Loading

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

@carols10cents carols10cents 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
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
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 8eb074c has been approved by sfackler

@kennytm kennytm mentioned this pull request Jul 13, 2017
Merged
@alexcrichton
Copy link
Member

@bors: r-

tidy failure :(

@kennytm
Copy link
Member

kennytm commented Jul 13, 2017

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

@Mark-Simulacrum
Copy link
Member

Pacified tidy and pulled in #43198.

@bors r+ p=50

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 1bd5f76 has been approved by Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 13, 2017
Closed
@bors
Copy link
Contributor

bors commented Jul 13, 2017

⌛ Testing commit 1bd5f760b6ac3e23585761e1d0e85384b8cf162e with merge ed4430fa5aa4f2eaa9691447f37b6e03aeb6d547...

@bors
Copy link
Contributor

bors commented Jul 13, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 3c7823a has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 13, 2017

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

@alexcrichton alexcrichton mentioned this pull request Jul 13, 2017
Closed
@bors
Copy link
Contributor

bors commented Jul 13, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 1d4b2e2 has been approved by brson

@bors
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
@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.
@brson brson mentioned this pull request Jul 13, 2017
Closed
@bors
Copy link
Contributor

bors commented Jul 13, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Jul 13, 2017 •
edited
Loading

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
Copy link
Member

@bors: retry

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 6a47b61 has been approved by alexcrichton

ollie27 and 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 
Closes rust-lang#38526
@sfackler @alexcrichton
Stabilize cmp::Reverse
d0f7613 
Closes rust-lang#40893
@sfackler @alexcrichton
Stabilize OsString::shrink_to_fit
527e718 
Closes rust-lang#40421
@sfackler @alexcrichton
Stabilize ThreadId
647df67 
Closes rust-lang#21507
@sfackler @alexcrichton
Add a stability marker for core::cmp::Reverse.0
455da0f 
Closes rust-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
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 9bbf947 has been approved by alexcrichton

@bors
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
@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
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
@alexcrichton alexcrichton deleted the beta-next branch July 13, 2017 23:39
@brson brson mentioned this pull request Jul 14, 2017
Closed
@kennytm kennytm mentioned this pull request Aug 29, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@sfackler sfackler

Labels
S-waiting-on-author Status: 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.