This is an automated email from the ASF dual-hosted git repository.
dingyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
The following commit(s) were added to refs/heads/master by this push:
new b6a14a0 Import asm macro and remove from prelude
new d79690b Merge pull request #372 from cschramm/asm
b6a14a0 is described below
commit b6a14a0e03bc84e42fa111469cb4d3413168d83d
Author: Christopher Schramm <[email protected]>
AuthorDate: Mon Feb 7 08:45:27 2022 +0100
Import asm macro and remove from prelude
The macro got removed from the prelude on stabilization (stabilized in
1.59).
---
sgx_trts/src/trts.rs | 1 +
sgx_tstd/src/prelude/v1.rs | 6 ------
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/sgx_trts/src/trts.rs b/sgx_trts/src/trts.rs
index 18f6b23..78147f7 100644
--- a/sgx_trts/src/trts.rs
+++ b/sgx_trts/src/trts.rs
@@ -16,6 +16,7 @@
// under the License..
use crate::libc;
+use core::arch::asm;
use core::mem;
use sgx_types::marker::ContiguousMemory;
use sgx_types::*;
diff --git a/sgx_tstd/src/prelude/v1.rs b/sgx_tstd/src/prelude/v1.rs
index 715598a..3ac7da0 100644
--- a/sgx_tstd/src/prelude/v1.rs
+++ b/sgx_tstd/src/prelude/v1.rs
@@ -51,12 +51,6 @@ pub use core::prelude::v1::{
PartialOrd,
};
-#[doc(no_inline)]
-pub use core::prelude::v1::asm;
-
-#[doc(no_inline)]
-pub use core::prelude::v1::global_asm;
-
// FIXME: Attribute and internal derive macros are not documented because for
them rustdoc generates
// dead links which fail link checker testing.
#[allow(deprecated, deprecated_in_future)]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
