Merge pull request #2685 from oasislabs/kostko/fix/ring-v0.16.11

runtime: Bump ring to 0.16.11, snow to 0.6.2

.buildkite/pipeline.yml

@@ -9,8 +9,8 @@ docker_plugin_default_config: &docker_plugin_default_config
     - /var/lib/buildkite-agent/.coveralls:/root/.coveralls
     - /var/lib/buildkite-agent/.codecov:/root/.codecov
     # Shared Rust incremental compile caches.
-    - /var/tmp/cargo_ic/debug:/var/tmp/artifacts/debug/incremental
-    - /var/tmp/cargo_ic/debug_sgx:/var/tmp/artifacts/x86_64-unknown-linux-sgx/debug/incremental
+    - /var/tmp/cargo_ic/debug:/var/tmp/artifacts/default/debug/incremental
+    - /var/tmp/cargo_ic/debug_sgx:/var/tmp/artifacts/sgx/x86_64-unknown-linux-sgx/debug/incremental
     # Shared Rust package checkouts directory.
     - /var/tmp/cargo_pkg/git:/root/.cargo/git
     - /var/tmp/cargo_pkg/registry:/root/.cargo/registry
@@ -120,7 +120,7 @@ steps:
       - .buildkite/rust/build_generic.sh /workdir -p simple-keyvalue-ops-client
 
       # Upload the built artifacts.
-      - cd /var/tmp/artifacts/debug
+      - cd /var/tmp/artifacts/default/debug
       - buildkite-agent artifact upload oasis-core-runtime-loader
       # Clients for E2E tests.
       - buildkite-agent artifact upload test-long-term-client
@@ -143,10 +143,10 @@ steps:
       - .buildkite/rust/build_runtime.sh tests/runtimes/simple-keyvalue
 
       # Upload the built artifacts.
-      - cd /var/tmp/artifacts/x86_64-fortanix-unknown-sgx/debug
+      - cd /var/tmp/artifacts/sgx/x86_64-fortanix-unknown-sgx/debug
       - buildkite-agent artifact upload oasis-core-keymanager-runtime.sgxs
       - buildkite-agent artifact upload simple-keyvalue.sgxs
-      - cd /var/tmp/artifacts/debug
+      - cd /var/tmp/artifacts/default/debug
       - buildkite-agent artifact upload oasis-core-keymanager-runtime
       - buildkite-agent artifact upload simple-keyvalue
     agents:

.buildkite/rust/build_generic.sh

@@ -35,5 +35,5 @@ source .buildkite/rust/common.sh
 # Run the build
 ###############
 pushd $src_dir
-  cargo build --locked $extra_args
+  CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/default" cargo build --locked $extra_args
 popd

.buildkite/rust/build_runtime.sh

@@ -46,10 +46,10 @@ fi
 ###############
 pushd $src_dir
     # Build non-SGX runtime. Checking KM policy requires SGX, disable it.
-    OASIS_UNSAFE_SKIP_KM_POLICY="1" cargo build --locked
+    CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/default" OASIS_UNSAFE_SKIP_KM_POLICY="1" cargo build --locked
 
     # Build SGX runtime.
     unset OASIS_UNSAFE_SKIP_KM_POLICY
-    cargo build --locked --target x86_64-fortanix-unknown-sgx
-    cargo elf2sgxs
+    CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/sgx" cargo build --locked --target x86_64-fortanix-unknown-sgx
+    CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/sgx" cargo elf2sgxs
 popd

.buildkite/rust/test_generic.sh

@@ -27,7 +27,7 @@ shift
 # Run the build and tests
 #########################
 pushd $src_dir
-  cargo build --all --locked --exclude simple-keyvalue
+  CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/default" cargo build --all --locked --exclude simple-keyvalue
   cargo fmt -- --check
-  cargo test --all --locked --exclude simple-keyvalue
+  CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/default" cargo test --all --locked --exclude simple-keyvalue
 popd

.buildkite/scripts/download_e2e_test_artifacts.sh

@@ -16,17 +16,17 @@ source .buildkite/scripts/common.sh
 download_artifact oasis-node go/oasis-node 755
 download_artifact integrationrunner.test go/oasis-node/integrationrunner 755
 download_artifact oasis-test-runner go/oasis-test-runner 755
-download_artifact oasis-core-runtime-loader target/debug 755
+download_artifact oasis-core-runtime-loader target/default/debug 755
 
 # Key manager runtime.
-download_artifact oasis-core-keymanager-runtime.sgxs target/x86_64-fortanix-unknown-sgx/debug 755
-download_artifact oasis-core-keymanager-runtime target/debug 755
+download_artifact oasis-core-keymanager-runtime.sgxs target/sgx/x86_64-fortanix-unknown-sgx/debug 755
+download_artifact oasis-core-keymanager-runtime target/default/debug 755
 
 # Test simple-keyvalue runtime and clients.
-download_artifact test-long-term-client target/debug 755
-download_artifact simple-keyvalue-client target/debug 755
-download_artifact simple-keyvalue-enc-client target/debug 755
-download_artifact simple-keyvalue-ops-client target/debug 755
+download_artifact test-long-term-client target/default/debug 755
+download_artifact simple-keyvalue-client target/default/debug 755
+download_artifact simple-keyvalue-enc-client target/default/debug 755
+download_artifact simple-keyvalue-ops-client target/default/debug 755
 
-download_artifact simple-keyvalue.sgxs target/x86_64-fortanix-unknown-sgx/debug 755
-download_artifact simple-keyvalue target/debug 755
+download_artifact simple-keyvalue.sgxs target/sgx/x86_64-fortanix-unknown-sgx/debug 755
+download_artifact simple-keyvalue target/default/debug 755

.buildkite/scripts/test_e2e.sh

@@ -18,9 +18,9 @@ WORKDIR=$PWD
 # Run test suite.
 #################
 # Determine correct runtime to use for SGX.
-runtime_target="."
+runtime_target="default"
 if [[ "${OASIS_TEE_HARDWARE:-""}" == "intel-sgx" ]]; then
-    runtime_target="x86_64-fortanix-unknown-sgx"
+    runtime_target="sgx/x86_64-fortanix-unknown-sgx"
 fi
 
 # We need a directory in the workdir so that Buildkite can fetch artifacts.
@@ -40,9 +40,9 @@ ${WORKDIR}/go/oasis-test-runner/oasis-test-runner \
     ${BUILDKITE:+--basedir ${TEST_BASE_DIR:-$PWD}/e2e} \
     --basedir.no_cleanup \
     --e2e.node.binary ${node_binary} \
-    --e2e.client.binary_dir ${WORKDIR}/target/debug \
+    --e2e.client.binary_dir ${WORKDIR}/target/default/debug \
     --e2e.runtime.binary_dir ${WORKDIR}/target/${runtime_target}/debug \
-    --e2e.runtime.loader ${WORKDIR}/target/debug/oasis-core-runtime-loader \
+    --e2e.runtime.loader ${WORKDIR}/target/default/debug/oasis-core-runtime-loader \
     --e2e.tee_hardware ${OASIS_TEE_HARDWARE:-""} \
     --log.level info \
     ${BUILDKITE_PARALLEL_JOB_COUNT:+--parallel.job_count ${BUILDKITE_PARALLEL_JOB_COUNT}} \

.changelog/2666.bugfix.md

@@ -0,0 +1 @@
+runtime: Bump ring to 0.16.11, snow to 0.6.2, Rust to 2020-02-16

.rustfmt.toml

@@ -5,7 +5,7 @@ newline_style = "Auto"
 use_small_heuristics = "Default"
 indent_style = "Block"
 wrap_comments = false
-format_doc_comments = false
+format_code_in_doc_comments = false
 comment_width = 80
 normalize_comments = false
 normalize_doc_attributes = false
@@ -34,7 +34,7 @@ struct_field_align_threshold = 0
 enum_discrim_align_threshold = 0
 match_arm_blocks = true
 force_multiline_blocks = false
-fn_args_density = "Tall"
+fn_args_layout = "Tall"
 brace_style = "SameLineWhere"
 control_brace_style = "AlwaysSameLine"
 trailing_semicolon = true