[incubator-teaclave-sgx-sdk] 01/01: beta-2019-12-18

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dingyu pushed a commit to branch rust-beta-channel
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git

commit 7240521f462316a8502237548674c19a40540545
Author: Yu Ding <di...@gmail.com>
AuthorDate: Tue Dec 24 17:11:54 2019 -0800

    beta-2019-12-18
---
 rust-toolchain            | 2 +-
 sgx_trts/src/c_str.rs     | 1 -
 sgx_trts/src/lib.rs       | 2 --
 sgx_tstd/src/lib.rs       | 1 +
 sgx_tstd/src/panicking.rs | 6 +++---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/rust-toolchain b/rust-toolchain
index 7ff88f6..9f68ec8 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-11-25
+beta-2019-12-18
diff --git a/sgx_trts/src/c_str.rs b/sgx_trts/src/c_str.rs
index 728dd55..4220213 100644
--- a/sgx_trts/src/c_str.rs
+++ b/sgx_trts/src/c_str.rs
@@ -571,7 +571,6 @@ impl CStr {
     /// performing any sanity checks. The provided slice **must** be nul-terminated
     /// and not contain any interior nul bytes.
     ///
-    #[rustc_const_unstable(feature = "const_cstr_unchecked")]
     pub const unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr {
         &*(bytes as *const [u8] as *const CStr)
     }
diff --git a/sgx_trts/src/lib.rs b/sgx_trts/src/lib.rs
index 7096ee5..c9b7b37 100644
--- a/sgx_trts/src/lib.rs
+++ b/sgx_trts/src/lib.rs
@@ -68,9 +68,7 @@
 
 #![feature(allocator_api)]
 #![feature(asm)]
-#![feature(rustc_const_unstable)]
 #![feature(const_raw_ptr_deref)]
-#![feature(const_cstr_unchecked)]
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
 #![allow(overflowing_literals)]
diff --git a/sgx_tstd/src/lib.rs b/sgx_tstd/src/lib.rs
index c460718..f55d067 100644
--- a/sgx_tstd/src/lib.rs
+++ b/sgx_tstd/src/lib.rs
@@ -71,6 +71,7 @@
 #![feature(log_syntax)]
 #![feature(maybe_uninit_ref)]
 #![feature(needs_panic_runtime)]
+#![feature(never_type)]
 #![feature(optin_builtin_traits)]
 #![feature(prelude_import)]
 #![feature(ptr_internals)]
diff --git a/sgx_tstd/src/panicking.rs b/sgx_tstd/src/panicking.rs
index 234c23b..582bfda 100644
--- a/sgx_tstd/src/panicking.rs
+++ b/sgx_tstd/src/panicking.rs
@@ -262,7 +262,7 @@ fn continue_panic_fmt(info: &PanicInfo<'_>) -> ! {
     }
 
     unsafe impl<'a> BoxMeUp for PanicPayload<'a> {
-        fn box_me_up(&mut self) -> *mut (dyn Any + Send) {
+        fn take_box(&mut self) -> *mut (dyn Any + Send) {
             let contents = mem::take(self.fill());
             Box::into_raw(Box::new(contents))
         }
@@ -310,7 +310,7 @@ pub fn begin_panic<M: Any + Send>(msg: M, file_line_col: &(&'static str, u32, u3
     }
 
     unsafe impl<A: Send + 'static> BoxMeUp for PanicPayload<A> {
-        fn box_me_up(&mut self) -> *mut (dyn Any + Send) {
+        fn take_box(&mut self) -> *mut (dyn Any + Send) {
             let data = match self.inner.take() {
                 Some(a) => Box::new(a) as Box<dyn Any + Send>,
                 None => Box::new(()),
@@ -380,7 +380,7 @@ pub fn update_count_then_panic(msg: Box<dyn Any + Send>) -> ! {
     struct RewrapBox(Box<dyn Any + Send>);
 
     unsafe impl BoxMeUp for RewrapBox {
-        fn box_me_up(&mut self) -> *mut (dyn Any + Send) {
+        fn take_box(&mut self) -> *mut (dyn Any + Send) {
             Box::into_raw(mem::replace(&mut self.0, Box::new(())))
         }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org