review updates

mongodb · Nov 2, 2021 · 0715c6b · 0715c6b
1 parent 5d29c35
commit 0715c6b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -384,11 +384,12 @@ functions:
         shell: bash
         working_dir: "src"
         script: |
-          # Exported before PREPARE_SHELL to avoid echo with xtrace
+          ${PREPARE_SHELL}
+          set +o xtrace
+          # Exported without xtrace to avoid leaking credentials
           export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
           export SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}"
 
-          ${PREPARE_SHELL}
           export MONGODB_URI="${MONGODB_URI}"
           export SSL="${SSL}"
           export SINGLE_MONGOS_LB_URI="${SINGLE_ATLASPROXY_SERVERLESS_URI}"

diff --git a/.evergreen/run-serverless-tests.sh b/.evergreen/run-serverless-tests.sh
@@ -15,8 +15,6 @@ elif [ "$ASYNC_RUNTIME" != "tokio" ]; then
     exit 1
 fi
 
-. ~/.cargo/env
-
 OPTIONS="-- -Z unstable-options --format json --report-time"
 
 if [ "$SINGLE_THREAD" = true ]; then

diff --git a/src/error.rs b/src/error.rs
@@ -490,7 +490,7 @@ pub struct WriteConcernError {
 
     /// Labels categorizing the error.
     #[serde(rename = "errorLabels", default)]
-    pub labels: Vec<String>,
+    pub(crate) labels: Vec<String>,
 }
 
 /// An error that occurred during a write operation that wasn't due to being unable to satisfy a
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,8 +15,6 @@ elif [ "$ASYNC_RUNTIME" != "tokio" ]; then @@
         exit 1
     fi
-    . ~/.cargo/env
     OPTIONS="-- -Z unstable-options --format json --report-time"
     if [ "$SINGLE_THREAD" = true ]; then
@@ Expand Down @@