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

Export Cancel from std::os::fortanix_sgx::usercalls::raw #100885

Merged
merged 1 commit into from
Aug 28, 2022
Merged

Export Cancel from std::os::fortanix_sgx::usercalls::raw #100885

merged 1 commit into from
Aug 28, 2022

Conversation

mzohreva
Copy link
Contributor

This was missed in #100642

cc @raoulstrackx and @jethrogb

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Aug 22, 2022
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Aug 22, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2022
@raoulstrackx
Copy link
Contributor

Looks good to me!

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

I think formally we'd want an ACP but these are fortanix-specific APIs which are not really thoroughly tracked in #56975 in any case, so seems OK. Everything is unstable.

@bors
Copy link
Contributor

bors commented Aug 27, 2022

📌 Commit 85b3df2 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 27, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#100885 - mzohreva:mz/sgx-export-cancel-type…
9ccd9c3 
…, r=Mark-Simulacrum

Export Cancel from std::os::fortanix_sgx::usercalls::raw

This was missed in rust-lang#100642

cc `@raoulstrackx` and `@jethrogb`
This was referenced Aug 28, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 28, 2022
@bors
Auto merge of rust-lang#101115 - matthiaskrgr:rollup-iy14ztr, r=matth…
3fdd578 
…iaskrgr

Rollup of 13 pull requests

Successful merges:

 - rust-lang#97015 (std::io: migrate ReadBuf to BorrowBuf/BorrowCursor)
 - rust-lang#98301 (Add GDB/LLDB pretty-printers for NonZero types)
 - rust-lang#99570 (Box::from(slice): Clarify that contents are copied)
 - rust-lang#100296 (Add standard C error function aliases to last_os_error)
 - rust-lang#100520 (Add mention of `BufReader` in `Read::bytes` docs)
 - rust-lang#100885 (Export Cancel from std::os::fortanix_sgx::usercalls::raw)
 - rust-lang#100955 (Some papercuts on error::Error)
 - rust-lang#101002 (Provide structured suggestion for `hashmap[idx] = val`)
 - rust-lang#101038 (no alignment check during interning)
 - rust-lang#101055 (Use smaller span for suggestions)
 - rust-lang#101091 (Extend attrs if local_def_id exists)
 - rust-lang#101098 (rustc_middle: Remove `Visibility::Invisible`)
 - rust-lang#101102 (unstable-book-gen: use std::fs::write)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1547638 into rust-lang:master Aug 28, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 28, 2022
@mzohreva mzohreva deleted the mz/sgx-export-cancel-type branch August 29, 2022 15:31
@raoulstrackx raoulstrackx mentioned this pull request Sep 20, 2023
Merged
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.65.0
Development

Successfully merging this pull request may close these issues.
6 participants
@mzohreva @rust-highfive @rustbot @raoulstrackx @Mark-Simulacrum @bors