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

Cherry-pick src/test changes with Centril's changes #63746

Merged
merged 1 commit into from
Aug 20, 2019
Merged

Cherry-pick src/test changes with Centril's changes #63746

merged 1 commit into from
Aug 20, 2019

Conversation

sd234678
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 20, 2019
@sd234678
Copy link
Contributor Author

r? @Centril

I've cherry picked these from #63347 and made the changes you suggested.

Thanks for your help on all this by the way.

Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

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

Thanks! r=me when green

@Centril
Copy link
Contributor

Centril commented Aug 20, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Aug 20, 2019

📌 Commit 4eec03d has been approved by Centril

@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 20, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 20, 2019
…coration-from-src/test, r=Centril

Cherry-pick src/test changes with Centril's changes

None
bors added a commit that referenced this pull request Aug 20, 2019
Rollup of 4 pull requests

Successful merges:

 - #62497 (Fix double resolving custom libdir)
 - #63209 (Stabilize `async_await` in Rust 1.39.0)
 - #63746 (Cherry-pick src/test changes with Centril's changes)
 - #63750 (rustc_metadata: replace LazySeq<T> with Lazy<[T]>.)

Failed merges:

r? @ghost
@bors bors merged commit 4eec03d into rust-lang:master Aug 20, 2019
@sd234678 sd234678 deleted the remove-unneeded-comment-decoration-from-src/test branch August 21, 2019 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants