Post rebase fixes

- Move async-usercalls to intel-sgx directory - Remove hacks/unsafe_typecasts.rs - Fix some typos in docs - Use marker trait for MakeSend to avoid warnings about issue #93367 - Update crossbeam and crossbeam-channel dependencies - Use nightly Rust in CI - Use SGX target for generating docs when crate has `feature(sgx_platform)`
fortanix · Aug 16, 2022 · 37881fc · 37881fc
1 parent bacbda4
commit 37881fc
Show file tree

Hide file tree

Showing 21 changed files with 131 additions and 176 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
             - clang-11
             - musl-tools
       rust:
-        - stable
+        - nightly
       env:
         - RUST_BACKTRACE=1
         - CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/async-usercalls/src/hacks/unsafe_typecasts.rs b/async-usercalls/src/hacks/unsafe_typecasts.rs
diff --git a/doc/generate-api-docs.sh b/doc/generate-api-docs.sh
@@ -58,6 +58,9 @@ for LIB in $LIBS_SORTED; do
         if FEATURES="$(cargo read-manifest|jq -r '.metadata.docs.rs.features | join(",")' 2> /dev/null)"; then
             ARGS="--features $FEATURES"
         fi
+        if grep -q 'feature(sgx_platform)' ./src/lib.rs; then
+            ARGS="$ARGS --target x86_64-fortanix-unknown-sgx"
+        fi
         cargo doc --no-deps --lib $ARGS
         popd
     fi

diff --git a/async-usercalls/Cargo.toml → intel-sgx/async-usercalls/Cargo.toml b/async-usercalls/Cargo.toml → intel-sgx/async-usercalls/Cargo.toml
@@ -17,12 +17,12 @@ categories = ["asynchronous"]
 
 [dependencies]
 # Project dependencies
-ipc-queue = { version = "0.1", path = "../ipc-queue" }
+ipc-queue = { version = "0.2", path = "../../ipc-queue" }
 fortanix-sgx-abi = { version = "0.4", path = "../fortanix-sgx-abi" }
 
 # External dependencies
 lazy_static = "1.4.0"     # MIT/Apache-2.0
-crossbeam-channel = "0.4" # MIT/Apache-2.0
+crossbeam-channel = "0.5" # MIT/Apache-2.0
 fnv = "1.0"               # MIT/Apache-2.0
 
 # For cargo test --target x86_64-fortanix-unknown-sgx

diff --git a/async-usercalls/src/batch_drop.rs → intel-sgx/async-usercalls/src/batch_drop.rs b/async-usercalls/src/batch_drop.rs → intel-sgx/async-usercalls/src/batch_drop.rs
diff --git a/async-usercalls/src/callback.rs → intel-sgx/async-usercalls/src/callback.rs b/async-usercalls/src/callback.rs → intel-sgx/async-usercalls/src/callback.rs
diff --git a/async-usercalls/src/duplicated.rs → intel-sgx/async-usercalls/src/duplicated.rs b/async-usercalls/src/duplicated.rs → intel-sgx/async-usercalls/src/duplicated.rs
diff --git a/async-usercalls/src/hacks/async_queues.rs → ...async-usercalls/src/hacks/async_queues.rs b/async-usercalls/src/hacks/async_queues.rs → ...async-usercalls/src/hacks/async_queues.rs