Skip to content

SGX target: implemented vectored I/O - #59869

Merged
bors merged 2 commits into
rust-lang:masterfrom
jethrogb:jb/sgx-iovec
Apr 30, 2019
Merged

SGX target: implemented vectored I/O#59869
bors merged 2 commits into
rust-lang:masterfrom
jethrogb:jb/sgx-iovec

Conversation

@jethrogb

@jethrogbjethrogb commented Apr 11, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

r? @sfackler

Includes #59857

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

jonas-schievink commented Apr 11, 2019

Copy link
Copy Markdown
Contributor

#58957 does not look like the right link

@Dylan-DPC-zz

Dylan-DPC-zz commented Apr 22, 2019

Copy link
Copy Markdown

ping from triage @sfackler waiting for your review on this

sfackler
sfackler reviewed Apr 24, 2019
View reviewed changes

@sfacklersfackler left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Oops, sorry!

Comment threadsrc/libstd/sys/sgx/abi/usercalls/mod.rs Outdated
Comment threadsrc/libstd/sys/sgx/abi/usercalls/mod.rs Outdated
@bors

bors commented Apr 29, 2019

Copy link
Copy Markdown
Collaborator

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

@sfackler

sfackler commented Apr 29, 2019

Copy link
Copy Markdown
Member

r=me after a rebase

@jethrogb

jethrogb commented Apr 29, 2019

Copy link
Copy Markdown
ContributorAuthor

Rebased

@sfackler

sfackler commented Apr 29, 2019

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Apr 29, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 09f4008 has been approved by sfackler

@borsbors 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 ofrust-lang#59869- jethrogb:jb/sgx-iovec, r=sfackler
c54b77c
SGX target: implemented vectored I/O
r? @sfackler
Includes rust-lang#59857
@CentrilCentril 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

bors commented Apr 30, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 09f4008 with merge f843ad6...

@bors
bors merged commit 09f4008 into rust-lang:masterApr 30, 2019
@jethrogb

jethrogb commented Apr 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Um

@jethrogb

jethrogb commented Apr 30, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

@jethrogbjethrogb mentioned this pull request Feb 25, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@sfacklersfacklersfackler left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@sfacklersfackler

Labels

S-waiting-on-borsStatus: 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