Merge #372

372: Fix various deprecation warnings r=raoulstrackx a=jethrogb



Co-authored-by: Jethro Beekman <[email protected]>

Author: bors[bot]

intel-sgx/aesm-client/build.rs

@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![deny(warnings)]
+
 extern crate protoc_rust;
 
 use std::env;
@@ -14,13 +16,11 @@ use std::path::PathBuf;
 fn main() {
     let out_dir = PathBuf::from(env::var("OUT_DIR").expect("cargo should set OUT_DIR"));
 
-    protoc_rust::run(protoc_rust::Args {
-        out_dir: out_dir.to_str().expect("OUT_DIR must be valid UTF-8"),
-        input: &["src/aesm_proto.proto"],
-        includes: &[],
-        customize: Default::default(),
-    })
-    .expect("protoc");
+    protoc_rust::Codegen::new()
+        .out_dir(&out_dir)
+        .input("src/aesm_proto.proto")
+        .run()
+        .expect("protoc");
 
     // Because of https://github.com/rust-lang/rfcs/issues/752, we can't `include!` the generated
     // protobufs directly. Instead, we generate a second generated file that can be `include!`-ed.

intel-sgx/enclave-runner/src/lib.rs

@@ -4,6 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![deny(warnings)]
 #![feature(asm)]
 #![doc(
     html_logo_url = "https://edp.fortanix.com/img/docs/edp-logo.svg",

intel-sgx/enclave-runner/src/loader.rs

@@ -102,6 +102,9 @@ impl From<DebugBuffer> for EnclavePanic {
 #[derive(Debug)]
 pub(crate) struct ErasedTcs {
     address: *mut c_void,
+    // This represents a resource so we need to maintain ownership even if not
+    // used
+    #[allow(dead_code)]
     tcs: Box<dyn Tcs>,
 }
 

intel-sgx/enclave-runner/src/tcs.rs

@@ -113,7 +113,7 @@ pub(crate) fn coenter<T: Tcs>(
                 user_handler: u64,
                 user_data: u64,
                 reserved: [u64; 27],
-            };
+            }
 
             impl fmt::Debug for SgxEnclaveRun {
                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

intel-sgx/sgxs-tools/src/bin/sgxs-load.rs

@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// Will be fixed in https://github.com/fortanix/rust-sgx/pull/369
+#![allow(deprecated)]
 #![feature(llvm_asm)]
 extern crate aesm_client;
 extern crate clap;

intel-sgx/sgxs-tools/src/sgx_detect/main.rs

@@ -147,7 +147,7 @@ pub struct SgxSupport {
     aesm_service: Result<TimeoutHardError<AesmClient>, Rc<Error>>,
     aesm_status: Option<AesmStatus>,
     #[serde(skip, default)]
-    dcap_library: bool,
+    _dcap_library: bool,
     #[serde(skip, default = "no_deserialize")]
     loader_sgxdev: Result<Rc<RefCell<SgxDevice>>, Rc<Error>>,
     #[serde(skip, default = "no_deserialize")]
@@ -168,7 +168,7 @@ struct FailTrace<'a>(pub &'a Error);
 impl<'a> fmt::Display for FailTrace<'a> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         write!(fmt, "{}", self.0)?;
-        for cause in self.0.causes() {
+        for cause in self.0.iter_causes() {
             write!(fmt, "\ncause: {}", cause)?;
         }
         Ok(())
@@ -333,7 +333,7 @@ impl SgxSupport {
             efi_softwareguardstatus: rcerr(efi_softwareguardstatus),
             aesm_service: rcerr(aesm_service),
             aesm_status,
-            dcap_library,
+            _dcap_library: dcap_library,
             loader_sgxdev: rcerr(loader_sgxdev),
             sgxdev_status: rcerr(sgxdev_status),
             loader_encllib: rcerr(loader_encllib),

ipc-queue/src/fifo.rs

@@ -6,7 +6,7 @@
 
 use std::cell::UnsafeCell;
 use std::mem;
-use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering, Ordering::SeqCst};
 use std::sync::Arc;
 
 use fortanix_sgx_abi::{FifoDescriptor, WithId};
@@ -152,7 +152,7 @@ impl<T: Transmittable> Fifo<T> {
     pub(crate) fn try_send_impl(&self, val: Identified<T>) -> Result</*wake up reader:*/ bool, TrySendError> {
         let (new, was_empty) = loop {
             // 1. Load the current offsets.
-            let current = Offsets::new(self.offsets.load(Ordering::SeqCst), self.data.len() as u32);
+            let current = Offsets::new(self.offsets.load(SeqCst), self.data.len() as u32);
             let was_empty = current.is_empty();
 
             // 2. If the queue is full, wait, then go to step 1.
@@ -164,24 +164,23 @@ impl<T: Transmittable> Fifo<T> {
             //    with the current offsets. If the CAS was not succesful, go to step 1.
             let new = current.increment_write_offset();
             let current = current.as_usize();
-            let prev = self.offsets.compare_and_swap(current, new.as_usize(), Ordering::SeqCst);
-            if prev == current {
+            if self.offsets.compare_exchange(current, new.as_usize(), SeqCst, SeqCst).is_ok() {
                 break (new, was_empty);
             }
         };
 
         // 4. Write the data, then the `id`.
         let slot = unsafe { &mut *self.data[new.write_offset()].get() };
         slot.data = val.data;
-        slot.id.store(val.id, Ordering::SeqCst);
+        slot.id.store(val.id, SeqCst);
 
         // 5. If the queue was empty in step 1, signal the reader to wake up.
         Ok(was_empty)
     }
 
     pub(crate) fn try_recv_impl(&self) -> Result<(Identified<T>, /*wake up writer:*/ bool), TryRecvError> {
         // 1. Load the current offsets.
-        let current = Offsets::new(self.offsets.load(Ordering::SeqCst), self.data.len() as u32);
+        let current = Offsets::new(self.offsets.load(SeqCst), self.data.len() as u32);
 
         // 2. If the queue is empty, wait, then go to step 1.
         if current.is_empty() {
@@ -194,7 +193,7 @@ impl<T: Transmittable> Fifo<T> {
         let (slot, id) = loop {
             // 4. Read the `id` at the new read offset.
             let slot = unsafe { &mut *self.data[new.read_offset()].get() };
-            let id = slot.id.load(Ordering::SeqCst);
+            let id = slot.id.load(SeqCst);
 
             // 5. If `id` is `0`, go to step 4 (spin). Spinning is OK because data is
             //    expected to be written imminently.
@@ -205,13 +204,13 @@ impl<T: Transmittable> Fifo<T> {
 
         // 6. Read the data, then store `0` in the `id`.
         let val = Identified { id, data: slot.data };
-        slot.id.store(0, Ordering::SeqCst);
+        slot.id.store(0, SeqCst);
 
         // 7. Store the new read offset, retrieving the old offsets.
         let before = fetch_adjust(
             self.offsets,
             new.read as isize - current.read as isize,
-            Ordering::SeqCst,
+            SeqCst,
         );
 
         // 8. If the queue was full before step 7, signal the writer to wake up.
@@ -288,7 +287,6 @@ impl Offsets {
 mod tests {
     use super::*;
     use crate::test_support::{NoopSynchronizer, TestValue};
-    use std::sync::atomic::{AtomicUsize, Ordering};
     use std::sync::mpsc;
     use std::thread;
 
@@ -367,10 +365,10 @@ mod tests {
     #[test]
     fn fetch_adjust_correctness() {
         let x = AtomicUsize::new(0);
-        fetch_adjust(&x, 5, Ordering::SeqCst);
-        assert_eq!(x.load(Ordering::SeqCst), 5);
-        fetch_adjust(&x, -3, Ordering::SeqCst);
-        assert_eq!(x.load(Ordering::SeqCst), 2);
+        fetch_adjust(&x, 5, SeqCst);
+        assert_eq!(x.load(SeqCst), 5);
+        fetch_adjust(&x, -3, SeqCst);
+        assert_eq!(x.load(SeqCst), 2);
     }
 
     #[test]

ipc-queue/src/lib.rs

@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![deny(warnings)]
+
 #![cfg_attr(target_env = "sgx", feature(sgx_platform))]
 
 use std::future::Future;