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

Update compiletest's read2 function #48165

Merged
merged 1 commit into from
Feb 15, 2018
Merged

Update compiletest's read2 function #48165

merged 1 commit into from
Feb 15, 2018

Conversation

alexcrichton
Copy link
Member

This was originally copied over from Cargo and Cargo has since been
updated so let's pull in the fixes here too!

@alexcrichton
Update compiletest's read2 function
4c658f7 
This was originally copied over from Cargo and Cargo has since [been
updated][update] so let's pull in the fixes here too!

[update]: rust-lang/cargo#5030
@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

@kennytm
Copy link
Member

kennytm commented Feb 12, 2018

There is a read2 in libstd too, should that be updated?

@alexcrichton
Copy link
Member Author

Nah that's actually written a bit differently in such a way that it doesn't need this update

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 12, 2018

📌 Commit 4c658f7 has been approved by Mark-Simulacrum

@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 Feb 12, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Feb 13, 2018
@kennytm
Rollup merge of rust-lang#48165 - alexcrichton:update-read2, r=Mark-S…
1806b19 
…imulacrum

Update compiletest's `read2` function

This was originally copied over from Cargo and Cargo has since [been
updated][update] so let's pull in the fixes here too!

[update]: rust-lang/cargo#5030
@kennytm kennytm mentioned this pull request Feb 13, 2018
Closed
bors added a commit that referenced this pull request Feb 13, 2018
@bors
Auto merge of #48177 - kennytm:rollup, r=kennytm
1811c36 
Rollup of 14 pull requests

- Successful merges: #47784, #47846, #48033, #48083, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48163, #48165, #48167
- Failed merges:
@kennytm kennytm mentioned this pull request Feb 14, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Feb 14, 2018
@kennytm
Rollup merge of rust-lang#48165 - alexcrichton:update-read2, r=Mark-S…
526e954 
…imulacrum

Update compiletest's `read2` function

This was originally copied over from Cargo and Cargo has since [been
updated][update] so let's pull in the fixes here too!

[update]: rust-lang/cargo#5030
bors added a commit that referenced this pull request Feb 14, 2018
@bors
Auto merge of #48203 - kennytm:rollup, r=kennytm
d3fb063 
Rollup of 22 pull requests

- Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035
- Failed merges:
bors added a commit that referenced this pull request Feb 15, 2018
@bors
Auto merge of #48203 - kennytm:rollup, r=kennytm
f6ee1ec 
Rollup of 22 pull requests

- Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035
- Failed merges:
bors added a commit that referenced this pull request Feb 15, 2018
@bors
Auto merge of #48203 - kennytm:rollup, r=kennytm
1670a53 
Rollup of 23 pull requests

- Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035, #48210
- Failed merges:
@kennytm kennytm merged commit 4c658f7 into rust-lang:master Feb 15, 2018
@alexcrichton alexcrichton deleted the update-read2 branch February 26, 2018 23:55
@kennytm kennytm mentioned this pull request Mar 15, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@alexcrichton @kennytm @Mark-Simulacrum @bors