Update the version of Rust

- Upgrade to Rust `1.58.0` - Update code to align with the newer coding conventions. - Clean up linting and compiler warnings. - Pin `pip<21.0` and `setuptools<=50.3.2` in `libindy/ci/ubuntu.dockerfile` to resolve build/test issues on ubuntu 16.04. Signed-off-by: Wade Barnes <wade@neoterictech.ca>
nuttaponr · Jan 19, 2022 · 1cdd4df · 1cdd4df
1 parent 113b79c
commit 1cdd4df
Show file tree

Hide file tree

Showing 42 changed files with 35 additions and 201 deletions.
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
@@ -595,7 +595,7 @@ def iosTesting() {
                 //FIXME We downgrade rust for iOS build as 1.46.0 forces building cdylib crate that causes linking errors.
                 //FIXME See https://github.com/rust-lang/rust/issues/79373 for details.
                 //FIXME It is fixed in nightly already and we will switch to 1.49 after it is released.
-                sh "rustup default 1.45.0"
+                sh "rustup default 1.58.0"
 
                 setupRustIOS()
                 setupBrewPackages()
@@ -1456,7 +1456,7 @@ def shell(command) {
 }
 
 def setupRust() {
-    shell("rustup default 1.46.0")
+    shell("rustup default 1.58.0")
 }
 
 def androidPublishing() {

diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci
@@ -264,7 +264,7 @@ def iosTesting() {
                 //FIXME We downgrade rust for iOS build as 1.46.0 forces building cdylib crate that causes linking errors.
                 //FIXME See https://github.com/rust-lang/rust/issues/79373 for details.
                 //FIXME It is fixed in nightly already and we will switch to 1.49 after it is released.
-                sh "rustup default 1.45.0"
+                sh "rustup default 1.58.0"
 
                 setupRustIOS()
                 setupBrewPackages()
@@ -666,7 +666,7 @@ def shell(command) {
 }
 
 def setupRust() {
-    shell("rustup default 1.46.0")
+    shell("rustup default 1.58.0")
 }
 
 def setupBrewPackages() {

diff --git a/ci/ga-ios-build.sh b/ci/ga-ios-build.sh
@@ -17,7 +17,7 @@ if [ -z "${LIBINDY_POD_VERSION}" ]; then
 fi
 
 if [ -z "${RUST_VER}" ]; then
-    export RUST_VER=1.45.2
+    export RUST_VER=1.58.0
     echo "ERROR: RUST_VER environment variable not specified, using $RUST_VER"
 fi
 

diff --git a/cli/src/command_executor.rs b/cli/src/command_executor.rs
@@ -51,6 +51,8 @@ impl ParamMetadata {
     }
 }
 
+// Turn off "error: field is never read: `dynamic_completion_type`" warning
+#[allow(dead_code)]
 #[derive(Debug)]
 pub struct CommandMetadata {
     name: &'static str,

diff --git a/cli/src/utils/mod.rs b/cli/src/utils/mod.rs
@@ -59,6 +59,6 @@ macro_rules! unwrap_or_return {
         match $result {
             Some(res) => res,
             None => return $err
-        };
+        }
     }
 }
diff --git a/libindy/ci/alpine.dockerfile b/libindy/ci/alpine.dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.12
 
 ARG UID=1000
 ARG GID=1000
-ARG RUST_VER="1.45.2"
+ARG RUST_VER="1.58.0"
 ARG INDYSDK_PATH=/home/indy/indy-sdk
 
 ENV RUST_LOG=warning

diff --git a/libindy/ci/centos.dockerfile b/libindy/ci/centos.dockerfile
@@ -39,7 +39,7 @@ RUN wget https://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-mav
 RUN sed -i s/\$releasever/6/g /etc/yum.repos.d/epel-apache-maven.repo
 RUN yum install -y apache-maven
 
-ENV RUST_ARCHIVE=rust-1.46.0-x86_64-unknown-linux-gnu.tar.gz
+ENV RUST_ARCHIVE=rust-1.58.0-x86_64-unknown-linux-gnu.tar.gz
 ENV RUST_DOWNLOAD_URL=https://static.rust-lang.org/dist/$RUST_ARCHIVE
 
 RUN mkdir -p /rust

diff --git a/libindy/ci/ubuntu.dockerfile b/libindy/ci/ubuntu.dockerfile
@@ -31,8 +31,8 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 RUN apt-get install -y nodejs
 
 RUN pip3 install -U \
-	pip \
-	setuptools \
+	'pip<21.0' \
+	'setuptools<=50.3.2' \
 	virtualenv \
 	twine==1.15.0 \
 	plumbum==1.6.7 six==1.12.0 \
@@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN useradd -ms /bin/bash -u $uid indy
 USER indy
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.46.0
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.58.0
 ENV PATH /home/indy/.cargo/bin:$PATH
 
 RUN cargo install cargo-deb

diff --git a/libindy/ci/ubuntu18.dockerfile b/libindy/ci/ubuntu18.dockerfile
@@ -45,7 +45,7 @@ RUN apt-get install -y wget
 RUN useradd -ms /bin/bash -u $uid indy
 USER indy
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.46.0
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.58.0
 ENV PATH /home/indy/.cargo/bin:$PATH
 
 RUN cargo install cargo-deb

diff --git a/libindy/ci/wrappers/wrapper-base.dockerfile b/libindy/ci/wrappers/wrapper-base.dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-ARG RUST_VER=1.46.0
+ARG RUST_VER=1.58.0
 
 RUN apt-get update && \
     apt-get install -y \

diff --git a/libindy/indy-api-types/src/errors.rs b/libindy/indy-api-types/src/errors.rs
@@ -137,7 +137,7 @@ impl fmt::Display for IndyError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut first = true;
 
-        for cause in Fail::iter_chain(self.inner.as_ref()) {
+        for cause in <dyn Fail>::iter_chain(self.inner.as_ref()) {
             if first {
                 first = false;
                 writeln!(f, "Error: {}", cause)?;
@@ -225,7 +225,7 @@ impl From<log::SetLoggerError> for IndyError {
 #[cfg(feature = "casting_errors")]
 impl From<UrsaCryptoError> for IndyError {
     fn from(err: UrsaCryptoError) -> Self {
-        let message = format!("UrsaCryptoError: {}", Fail::iter_causes(&err).map(|e| e.to_string()).collect::<String>());
+        let message = format!("UrsaCryptoError: {}", <dyn Fail>::iter_causes(&err).map(|e| e.to_string()).collect::<String>());
 
         match err.kind() {
             UrsaCryptoErrorKind::InvalidState => IndyError::from_msg(IndyErrorKind::InvalidState, message),

diff --git a/libindy/src/commands/non_secrets.rs b/libindy/src/commands/non_secrets.rs
@@ -312,8 +312,8 @@ impl NonSecretsCommandExecutor {
     }
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct SearchRecords {
     pub total_count: Option<usize>,
     pub records: Option<Vec<WalletRecord>>

diff --git a/libindy/src/domain/cache.rs b/libindy/src/domain/cache.rs
@@ -1,11 +1,11 @@
-#[serde(rename_all = "camelCase")]
 #[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct PurgeOptions {
     pub max_age: Option<i32>,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Debug, Deserialize, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct GetCacheOptions {
     pub no_cache: Option<bool>,     // Skip usage of cache,
     pub no_update: Option<bool>,    // Use only cached data, do not try to update.

diff --git a/libindy/src/domain/ledger/response.rs b/libindy/src/domain/ledger/response.rs
@@ -60,8 +60,8 @@ pub struct TxnMetadata {
     pub creation_time: u64,
 }
 
-#[serde(tag = "op")]
 #[derive(Deserialize, Debug)]
+#[serde(tag = "op")]
 pub enum Message<T> {
     #[serde(rename = "REQNACK")]
     ReqNACK(Response),

diff --git a/libindy/src/services/pool/types.rs b/libindy/src/services/pool/types.rs
@@ -354,8 +354,8 @@ pub struct SimpleRequest {
     pub req_id: u64,
 }
 
-#[serde(tag = "op")]
 #[derive(Serialize, Deserialize, Debug)]
+#[serde(tag = "op")]
 pub enum Message {
     #[serde(rename = "CONSISTENCY_PROOF")]
     ConsistencyProof(ConsistencyProof),

diff --git a/libindy/src/utils/result.rs b/libindy/src/utils/result.rs
@@ -61,7 +61,7 @@ macro_rules! unwrap_opt_or_return {
         match $opt {
             Some(val) => val,
             None => return $err
-        };
+        }
     }
 }
 
@@ -70,6 +70,6 @@ macro_rules! unwrap_or_return {
         match $result {
             Ok(res) => res,
             Err(_) => return $err
-        };
+        }
     }
 }
diff --git a/libindy/tests/utils/types.rs b/libindy/tests/utils/types.rs
@@ -77,8 +77,8 @@ pub struct WalletRecord {
     pub tags: Option<HashMap<String, String>>
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct SearchRecords {
     pub total_count: Option<i32>,
     pub records: Option<Vec<WalletRecord>>

diff --git a/libnullpay/src/libindy/ledger.rs b/libnullpay/src/libindy/ledger.rs
@@ -28,7 +28,6 @@ pub fn build_get_txn_request(
 
 
 extern {
-    #[no_mangle]
     pub fn indy_build_get_txn_request(command_handle: i32,
                                       submitter_did: *const c_char,
                                       ledger_type: *const c_char,

diff --git a/libnullpay/src/libindy/logger.rs b/libnullpay/src/libindy/logger.rs
@@ -35,6 +35,5 @@ pub fn get_logger() -> Result<(*const c_void, Option<EnabledCB>, Option<LogCB>,
 }
 
 extern {
-    #[no_mangle]
     pub fn indy_get_logger(context: *mut *const c_void, enabled_cb_p: *mut Option<EnabledCB>, log_cb_p: *mut Option<LogCB>, flush_cb_p: *mut Option<FlushCB>) -> ErrorCode;
 }
diff --git a/libnullpay/src/libindy/payments.rs b/libnullpay/src/libindy/payments.rs
@@ -161,7 +161,6 @@ pub fn list_payment_addresses(wallet_handle: i32,
 }
 
 extern {
-    #[no_mangle]
     pub fn indy_register_payment_method(
         command_handle: i32,
         payment_method: *const c_char,
@@ -182,7 +181,6 @@ extern {
         verify_with_address: Option<VerifyWithAddressCB>,
         cb: Option<extern fn(command_handle_: i32, err: ErrorCode)>) -> ErrorCode;
 
-    #[no_mangle]
     fn indy_list_payment_addresses(command_handle: i32,
                                    wallet_handle: i32,
                                    cb: Option<extern fn(command_handle_: i32,

diff --git a/vcx/ci/test.dockerfile b/vcx/ci/test.dockerfile
@@ -47,7 +47,7 @@ RUN curl -fsOSL $LIBINDY_DOWNLOAD_URL \
     && apt-get -f install
 
 # Install Rust
-ENV RUST_ARCHIVE=rust-1.20.0-x86_64-unknown-linux-gnu.tar.gz
+ENV RUST_ARCHIVE=rust-1.58.0-x86_64-unknown-linux-gnu.tar.gz
 ENV RUST_DOWNLOAD_URL=https://static.rust-lang.org/dist/$RUST_ARCHIVE
 
 RUN mkdir -p /rust

diff --git a/vcx/ci/ubuntu.dockerfile b/vcx/ci/ubuntu.dockerfile
@@ -60,7 +60,7 @@ ARG uid=1000
 RUN useradd -ms /bin/bash -u $uid vcx
 USER vcx
 
-ARG RUST_VER="1.46.0"
+ARG RUST_VER="1.58.0"
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER
 ENV PATH /home/vcx/.cargo/bin:$PATH
 

diff --git a/vcx/dummy-cloud-agent/src/domain/a2a.rs b/vcx/dummy-cloud-agent/src/domain/a2a.rs
@@ -208,8 +208,8 @@ pub struct SendMessages {
     pub uids: Vec<String>,
 }
 
-#[serde(untagged)]
 #[derive(Debug, Deserialize, Serialize)]
+#[serde(untagged)]
 pub enum MessageDetail {
     ConnectionRequestRedirect(ConnectionRequestRedirectMessageDetail),
     ConnectionRequestAnswer(ConnectionRequestAnswerMessageDetail),

diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.01.libindy.setup.sh b/vcx/libvcx/build_scripts/ios/mac/mac.01.libindy.setup.sh
@@ -44,7 +44,7 @@ fi
 
 if [[ $RUSTUP_VERSION =~ ^'rustup ' ]]; then
     rustup update
-    rustup default 1.46.0
+    rustup default 1.58.0
     rustup component add rls-preview rust-analysis rust-src
     echo "Using rustc version $(rustc --version)"
     rustup target add aarch64-apple-ios x86_64-apple-ios

diff --git a/vcx/libvcx/src/error/mod.rs b/vcx/libvcx/src/error/mod.rs
@@ -234,7 +234,7 @@ impl fmt::Display for VcxError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut first = true;
 
-        for cause in Fail::iter_chain(&self.inner) {
+        for cause in dyn Fail::iter_chain(&self.inner) {
             if first {
                 first = false;
                 writeln!(f, "Error: {}", cause)?;
@@ -426,7 +426,7 @@ pub fn set_current_error(err: &VcxError) {
         let error_json = json!({
             "error": err.kind().to_string(),
             "message": err.to_string(),
-            "cause": Fail::find_root_cause(err).to_string(),
+            "cause": dyn Fail::find_root_cause(err).to_string(),
             "backtrace": err.backtrace().map(|bt| bt.to_string())
         }).to_string();
         error.replace(Some(CStringUtils::string_to_cstring(error_json)));

diff --git a/vcx/libvcx/src/messages/mod.rs b/vcx/libvcx/src/messages/mod.rs
@@ -551,8 +551,8 @@ pub struct MessageSent {
     pub uids: Vec<String>,
 }
 
-#[serde(untagged)]
 #[derive(Debug, Deserialize, Serialize)]
+#[serde(untagged)]
 pub enum MessageDetail {
     ConnectionRequestAnswer(AcceptInviteMessageDetails),
     ConnectionRequestRedirect(RedirectConnectionMessageDetails),

diff --git a/vcx/libvcx/src/utils/libindy/ledger.rs b/vcx/libvcx/src/utils/libindy/ledger.rs
@@ -485,8 +485,8 @@ pub struct Request {
     pub endorser: Option<String>
 }
 
-#[serde(tag = "op")]
 #[derive(Deserialize, Debug)]
+#[serde(tag = "op")]
 pub enum Response {
     #[serde(rename = "REQNACK")]
     ReqNACK(Reject),

diff --git a/wrappers/rust/indy-sys/build.rs b/wrappers/rust/indy-sys/build.rs
@@ -48,14 +48,14 @@ fn find_dir(dir_name: Option<String>, use_static: bool) {
 fn find_pkg(use_static: bool) {
     match pkg_config::Config::new().statik(use_static).probe("libindy") {
         Ok(_) => println!("cargo:warning=Libindy found in pkgcfg tree."),
-        Err(e) => panic!(format!("Error: {:?}", e)),
+        Err(e) => panic!("Error: {:?}", e),
     }
 }
 
 #[cfg(target_env = "msvc")]
 fn find_pkg(_use_static: bool) {
     match vcpkg::Config::new().emit_includes(true).lib_name("libindy").probe("indy") {
         Ok(_) => println!("cargo:warning=Libindy found in vcpkg tree."),
-        Err(e) => panic!(format!("Error: {:?}", e)),
+        Err(e) => panic!("Error: {:?}", e),
     }
 }