[cargo] use unstable cargo feature resolver.

Closes: diem#5199
Approved by: sausagee

Author: rexhoffman

.circleci/config.yml

@@ -51,7 +51,9 @@ commands:
             echo 'export LIBRA_DUMP_LOGS=1' >> $BASH_ENV
             echo 'export CARGO_INCREMENTAL=0' >> $BASH_ENV
             echo 'export CI_TIMEOUT="timeout 40m"' >> $BASH_ENV
-            echo 'export RUST_NIGHTLY=nightly-2020-07-08' >> $BASH_ENV
+            export RUST_NIGHTLY=$(cat cargo-toolchain)
+            echo 'export RUST_NIGHTLY='${RUST_NIGHTLY} >> $BASH_ENV
+
   install_deps:
     steps:
       - run:
@@ -65,11 +67,12 @@ commands:
       - run:
           name: Set cargo Environment
           command: |
+            # https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#features
+            export CARGOFLAGS=$(cat cargo-flags)
+            echo 'export CARGOFLAGS='${CARGOFLAGS} >> $BASH_ENV
             # Use nightly version of cargo to access the new feature resolver
             echo 'export CARGO=$(rustup which --toolchain $RUST_NIGHTLY cargo)' >> $BASH_ENV
             # Turn on the experimental feature resolver in cargo. See:
-            # https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#features
-            echo 'export CARGOFLAGS=-Zfeatures=all' >> $BASH_ENV
   install_code_coverage_deps:
     steps:
       - run:
@@ -622,18 +625,20 @@ jobs:
       - run:
           name: should pre build docker images (targeting a release branch)?
           command: |
-            export RELEASE_BRANCH_PATTERN='^v[0-9]+-release$'
-            export TEST_BRANCH_PATTERN="^testflow[0-9]+$"
             export commit_message=$( git log -1 --pretty=%B )
             export pr_num=`echo "$commit_message" | tail -2 | head -1 | sed 's/Closes: #//'`
             if [ -z $pr_num ]; then
               echo "Did not find pull request num in commit message. -\\_(O_o)_/-";
               exit 1
             fi
             curl -o /tmp/pr https://api.github.com/repos/libra/libra/pulls/${pr_num}
-            export TARGET_BRANCH=$( cat /tmp/pr | jq ".base .ref" | sed 's/"//g' )
-            if [[ $TARGET_BRANCH =~ $RELEASE_BRANCH_PATTERN ]] || [[ $TARGET_BRANCH =~ $TEST_BRANCH_PATTERN ]]; then
-              export BRANCH=$TARGET_BRANCH
+            export BRANCH=$( cat /tmp/pr | jq ".base .ref" | sed 's/"//g' )
+
+            export IS_RELEASE=$( if [[ "$BRANCH" =~ "^v[0-9|.]+-release$" ]]; then echo true; else echo false; fi )
+            export IS_TEST=$( if [[ "$BRANCH" =~ "^testflow[0-9|.]+$" ]]; then echo true; else echo false; fi )
+            export IS_PRE_RELEASE=$( if [[ "$BRANCH" =~ "^premainnet-[0-9|.]+$" ]]; then echo true; else echo false; fi )
+
+            if [[ $IS_RELEASE || $IS_TEST || $IS_PRE_RELEASE ]] ; then
               echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
               docker/update_or_build.sh -u -p -b ${BRANCH} -n client
               docker/update_or_build.sh -u -p -b ${BRANCH} -n init
@@ -679,16 +684,18 @@ workflows:
               ignore:
                 - gh-pages
                 - master
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - terraform:
           filters:
             branches:
               ignore:
                 - gh-pages
                 - master
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - prefetch-crates
       - lint:
           requires:
@@ -697,8 +704,9 @@ workflows:
             branches:
               ignore:
                 - gh-pages
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-0.[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - build-dev:
           requires:
             - prefetch-crates
@@ -707,8 +715,9 @@ workflows:
               ignore:
                 - gh-pages
                 - master
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - build-release:
           requires:
             - prefetch-crates
@@ -717,8 +726,9 @@ workflows:
               ignore:
                 - gh-pages
                 - master
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - run-e2e-test:
           requires:
             - prefetch-crates
@@ -727,8 +737,9 @@ workflows:
               ignore:
                 - gh-pages
                 - master
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - run-unit-test:
           requires:
             - prefetch-crates
@@ -737,8 +748,9 @@ workflows:
               ignore:
                 - gh-pages
                 - master
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - run-crypto-unit-test:
           requires:
             - prefetch-crates
@@ -747,17 +759,19 @@ workflows:
               ignore:
                 - gh-pages
                 - master
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - build-docs:
           requires:
             - lint
           filters:
             branches:
               ignore:
                 - gh-pages
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
       - deploy-docs:
           requires:
             - build-docs
@@ -779,8 +793,9 @@ workflows:
           filters:
             branches:
               only:
-                - /^testflow[\d]+$/
-                - /^v[\d]+-release$/
+                - /^testflow[\d|.]+$/
+                - /^premainnet-[\d|.]+$/
+                - /^v[\d|.]+-release$/
 
   scheduled-workflow:
     triggers:

cargo-flags

@@ -0,0 +1 @@
+-Zfeatures=all

cargo-toolchain

@@ -0,0 +1 @@
+nightly-2020-07-08

docker/build-common.sh

@@ -7,7 +7,13 @@ set -e
 # It unifies RUSFLAGS, compilation flags (like --release) and set of binary crates to compile in common docker layer
 
 export RUSTFLAGS="-Ctarget-cpu=skylake -Ctarget-feature=+aes,+sse2,+sse4.1,+ssse3"
-cargo build --release -p libra-genesis-tool -p libra-node -p cli -p config-builder -p libra-key-manager -p safety-rules -p db-bootstrapper -p backup-cli -p cluster-test "$@"
+
+# We are using a pinned nightly cargo until feature resolver v2 is released (around 10/2020), but compiling with stable rustc
+export RUST_NIGHTLY=$(cat cargo-toolchain)
+export CARGO=$(rustup which --toolchain $RUST_NIGHTLY cargo)
+export CARGOFLAGS=$(cat cargo-flags)
+
+${CARGO} ${CARGOFLAGS} build --release -p libra-genesis-tool -p libra-node -p cli -p config-builder -p libra-key-manager -p safety-rules -p db-bootstrapper -p backup-cli -p cluster-test "$@"
 
 rm -rf target/release/{build,deps,incremental}
 

docker/client/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /libra
 COPY rust-toolchain /libra/rust-toolchain
 RUN rustup install $(cat rust-toolchain)
 
+COPY cargo-toolchain /libra/cargo-toolchain
+RUN rustup install $(cat cargo-toolchain)
+
 FROM toolchain AS builder
 
 COPY . /libra

docker/cluster-test/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /libra
 COPY rust-toolchain /libra/rust-toolchain
 RUN rustup install $(cat rust-toolchain)
 
+COPY cargo-toolchain /libra/cargo-toolchain
+RUN rustup install $(cat cargo-toolchain)
+
 FROM toolchain AS builder
 
 COPY . /libra

docker/init/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /libra
 COPY rust-toolchain /libra/rust-toolchain
 RUN rustup install $(cat rust-toolchain)
 
+COPY cargo-toolchain /libra/cargo-toolchain
+RUN rustup install $(cat cargo-toolchain)
+
 FROM toolchain AS builder
 
 COPY . /libra

docker/mint/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /libra
 COPY rust-toolchain /libra/rust-toolchain
 RUN rustup install $(cat rust-toolchain)
 
+COPY cargo-toolchain /libra/cargo-toolchain
+RUN rustup install $(cat cargo-toolchain)
+
 FROM toolchain AS builder
 
 COPY . /libra

docker/safety-rules/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /libra
 COPY rust-toolchain /libra/rust-toolchain
 RUN rustup install $(cat rust-toolchain)
 
+COPY cargo-toolchain /libra/cargo-toolchain
+RUN rustup install $(cat cargo-toolchain)
+
 FROM toolchain AS builder
 
 COPY . /libra

docker/tools/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /libra
 COPY rust-toolchain /libra/rust-toolchain
 RUN rustup install $(cat rust-toolchain)
 
+COPY cargo-toolchain /libra/cargo-toolchain
+RUN rustup install $(cat cargo-toolchain)
+
 FROM toolchain AS builder
 
 COPY . /libra

docker/validator/Dockerfile

@@ -12,6 +12,9 @@ WORKDIR /libra
 COPY rust-toolchain /libra/rust-toolchain
 RUN rustup install $(cat rust-toolchain)
 
+COPY cargo-toolchain /libra/cargo-toolchain
+RUN rustup install $(cat cargo-toolchain)
+
 FROM toolchain AS builder
 
 COPY . /libra

scripts/coverage_report.sh

@@ -90,6 +90,10 @@ export RUST_MIN_STACK=8388608 # 8 * 1024 * 1024
 echo "Cleaning project..."
 (cd "$TEST_DIR"; cargo clean)
 
+export RUST_NIGHTLY=$(cat cargo-toolchain)
+export CARGO=$(rustup which --toolchain $RUST_NIGHTLY cargo)
+export CARGOFLAGS=$(cat cargo-flags)
+
 echo check ulimits
 ulimit -a
 
@@ -106,7 +110,7 @@ while read -r line; do
         fi
         # Don't fail out of the loop here. We just want to run the test binary
         # to collect its profile data.  Also note which crates fail under coverage.
-        ( cd "$dirline" && pwd && RUST_BACKTRACE=1 cargo xtest ) || FAILED_CRATES="${FAILED_CRATES}:${subdir}"
+        ( cd "$dirline" && pwd && RUST_BACKTRACE=1 ${CARGO} ${CARGOFLAGS}  xtest ) || FAILED_CRATES="${FAILED_CRATES}:${subdir}"
 done < <(find "$TEST_DIR" -name 'Cargo.toml')
 
 # Make the coverage directory if it doesn't exist