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

SGX target: implemented vectored I/O #59869

Merged
merged 2 commits into from
Apr 30, 2019
Merged

SGX target: implemented vectored I/O #59869

merged 2 commits into from
Apr 30, 2019

Conversation

jethrogb
Copy link
Contributor

@jethrogb jethrogb commented Apr 11, 2019 •
edited
Loading

r? @sfackler

Includes #59857

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2019
@jonas-schievink
Copy link
Contributor

#58957 does not look like the right link

@Dylan-DPC-zz
Copy link

ping from triage @sfackler waiting for your review on this

sfackler
sfackler reviewed Apr 24, 2019
View reviewed changes
Copy link
Member

@sfackler sfackler left a comment

Choose a reason for hiding this comment

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

Oops, sorry!

src/libstd/sys/sgx/abi/usercalls/mod.rs Outdated Show resolved Hide resolved
src/libstd/sys/sgx/abi/usercalls/mod.rs Outdated Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Apr 29, 2019

☔ The latest upstream changes (presumably #60377) made this pull request unmergeable. Please resolve the merge conflicts.

@sfackler
Copy link
Member

r=me after a rebase

@jethrogb
Copy link
Contributor Author

Rebased

@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 29, 2019

📌 Commit 09f4008 has been approved by sfackler

@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 Apr 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
@Centril
Rollup merge of rust-lang#59869 - jethrogb:jb/sgx-iovec, r=sfackler
c54b77c 
SGX target: implemented vectored I/O

r? @sfackler

Includes rust-lang#59857
@Centril Centril mentioned this pull request Apr 30, 2019
Merged
bors added a commit that referenced this pull request Apr 30, 2019
@bors
Auto merge of #60389 - Centril:rollup-nefreyr, r=Centril
f843ad6 
Rollup of 4 pull requests

Successful merges:

 - #59869 (SGX target: implemented vectored I/O)
 - #60238 (Update rustfmt to 1.2.2)
 - #60276 (Cleanup the MIR visitor)
 - #60380 (Fix line number display in source view)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Apr 30, 2019

⌛ Testing commit 09f4008 with merge f843ad6...

@bors bors merged commit 09f4008 into rust-lang:master Apr 30, 2019
@jethrogb
Copy link
Contributor Author

Um

@jethrogb
Copy link
Contributor Author

jethrogb commented Apr 30, 2019 •
edited
Loading

Ok I think bors was just slow to comment that it's trying this PR; nothing bad actually happened!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfackler sfackler sfackler left review comments

Assignees

@sfackler sfackler

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.
6 participants
@jethrogb @jonas-schievink @Dylan-DPC-zz @bors @sfackler @rust-highfive