Use correct target depending on the rust version. (#2022)

Also blocks rust 1.82 and 1.83 from from being used to build contracts.

Author: fnando

.github/workflows/bindings-ts.yml

@@ -37,7 +37,7 @@ jobs:
         run: sudo apt update && sudo apt install -y libdbus-1-dev libudev-dev
         if: runner.os == 'Linux'
       - run: cargo build
-      - run: rustup target add wasm32-unknown-unknown
+      - run: rustup target add wasm32v1-none
       - run: make build-test-wasms
       - run: npm ci && npm run test
         working-directory: cmd/crates/soroban-spec-typescript/ts-tests

.github/workflows/rpc-tests.yml

@@ -46,6 +46,6 @@ jobs:
         run: |
           gnome-keyring-daemon
       - run: cargo build --features additional-libs
-      - run: rustup target add wasm32-unknown-unknown
+      - run: rustup target add wasm32v1-none
       - run: make build-test-wasms
       - run: SOROBAN_PORT=8000 cargo test --features it --package soroban-test --test it -- integration --test-threads=1

.github/workflows/rust.yml

@@ -89,7 +89,7 @@ jobs:
     - run: rustup update
     - run: cargo version
     - run: rustup target add ${{ matrix.sys.target }}
-    - run: rustup target add wasm32-unknown-unknown
+    - run: rustup target add wasm32v1-none
     - if: runner.os == 'Linux'
       run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libudev-dev libdbus-1-dev
     - run: cargo clippy --all-targets --target ${{ matrix.sys.target }}

Cargo.lock

@@ -40,7 +40,7 @@ build:
 	cargo build
 
 build-test-wasms:
-	cargo build --package 'test_*' --profile test-wasms --target wasm32-unknown-unknown
+	cargo build --package 'test_*' --profile test-wasms --target wasm32v1-none
 
 build-test: build-test-wasms install
 
@@ -72,11 +72,11 @@ publish:
 
 typescript-bindings-fixtures: build-test-wasms
 	cargo run -- contract bindings typescript \
-					--wasm ./target/wasm32-unknown-unknown/test-wasms/test_custom_types.wasm \
+					--wasm ./target/wasm32v1-none/test-wasms/test_custom_types.wasm \
 					--output-dir ./cmd/crates/soroban-spec-typescript/fixtures/test_custom_types \
 					--overwrite && \
 	cargo run -- contract bindings typescript \
-					--wasm ./target/wasm32-unknown-unknown/test-wasms/test_constructor.wasm \
+					--wasm ./target/wasm32v1-none/test-wasms/test_constructor.wasm \
 					--output-dir ./cmd/crates/soroban-spec-typescript/fixtures/test_constructor \
 					--overwrite
 

Makefile

@@ -72,7 +72,7 @@ mod test {
     use super::generate;
 
     const EXAMPLE_WASM: &[u8] =
-        include_bytes!("../../../../target/wasm32-unknown-unknown/test-wasms/test_udt.wasm");
+        include_bytes!("../../../../target/wasm32v1-none/test-wasms/test_udt.wasm");
 
     #[test]
     fn example() {

cmd/crates/soroban-spec-json/src/lib.rs

@@ -59,7 +59,7 @@ impl Spec {
                 } else {
                     *out = Some(section.data().to_vec());
                 }
-            };
+            }
         }
 
         let mut env_meta_base64 = None;
@@ -179,7 +179,7 @@ impl Display for Spec {
 
 fn write_func(f: &mut std::fmt::Formatter<'_>, func: &ScSpecFunctionV0) -> std::fmt::Result {
     writeln!(f, " • Function: {}", func.name.to_utf8_string_lossy())?;
-    if func.doc.len() > 0 {
+    if !func.doc.is_empty() {
         writeln!(
             f,
             "     Docs: {}",
@@ -202,7 +202,7 @@ fn write_func(f: &mut std::fmt::Formatter<'_>, func: &ScSpecFunctionV0) -> std::
 
 fn write_union(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtUnionV0) -> std::fmt::Result {
     writeln!(f, " • Union: {}", format_name(&udt.lib, &udt.name))?;
-    if udt.doc.len() > 0 {
+    if !udt.doc.is_empty() {
         writeln!(
             f,
             "     Docs: {}",
@@ -219,7 +219,7 @@ fn write_union(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtUnionV0) -> std::
 
 fn write_struct(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtStructV0) -> std::fmt::Result {
     writeln!(f, " • Struct: {}", format_name(&udt.lib, &udt.name))?;
-    if udt.doc.len() > 0 {
+    if !udt.doc.is_empty() {
         writeln!(
             f,
             "     Docs: {}",
@@ -234,7 +234,7 @@ fn write_struct(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtStructV0) -> std
             field.name.to_utf8_string_lossy(),
             indent(&format!("{:#?}", field.type_), 8).trim()
         )?;
-        if field.doc.len() > 0 {
+        if !field.doc.is_empty() {
             writeln!(f, "{}", indent(&format!("{:#?}", field.doc), 8))?;
         }
     }
@@ -244,7 +244,7 @@ fn write_struct(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtStructV0) -> std
 
 fn write_enum(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtEnumV0) -> std::fmt::Result {
     writeln!(f, " • Enum: {}", format_name(&udt.lib, &udt.name))?;
-    if udt.doc.len() > 0 {
+    if !udt.doc.is_empty() {
         writeln!(
             f,
             "     Docs: {}",
@@ -261,7 +261,7 @@ fn write_enum(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtEnumV0) -> std::fm
 
 fn write_error(f: &mut std::fmt::Formatter<'_>, udt: &ScSpecUdtErrorEnumV0) -> std::fmt::Result {
     writeln!(f, " • Error: {}", format_name(&udt.lib, &udt.name))?;
-    if udt.doc.len() > 0 {
+    if !udt.doc.is_empty() {
         writeln!(
             f,
             "     Docs: {}",
@@ -285,13 +285,13 @@ fn indent(s: &str, n: usize) -> String {
 }
 
 fn format_name(lib: &StringM<80>, name: &StringM<60>) -> String {
-    if lib.len() > 0 {
+    if lib.is_empty() {
+        name.to_utf8_string_lossy()
+    } else {
         format!(
             "{}::{}",
             lib.to_utf8_string_lossy(),
             name.to_utf8_string_lossy()
         )
-    } else {
-        name.to_utf8_string_lossy()
     }
 }

cmd/crates/soroban-spec-tools/src/contract.rs

@@ -1,4 +1,5 @@
 #![allow(clippy::missing_errors_doc, clippy::must_use_candidate)]
+use std::fmt::Write;
 use std::str::FromStr;
 
 use itertools::Itertools;
@@ -452,7 +453,7 @@ impl Spec {
                 );
             }
             (ScSpecUdtUnionCaseV0::TupleV0(ScSpecUdtUnionCaseTupleV0 { .. }), Some(_)) => {}
-        };
+        }
         Ok(ScVal::Vec(Some(res.try_into().map_err(Error::Xdr)?)))
     }
 
@@ -465,7 +466,7 @@ impl Spec {
         let ScSpecTypeTuple { value_types } = tuple;
         if items.len() != value_types.len() {
             return Err(Error::InvalidValue(Some(t.clone())));
-        };
+        }
         let parsed: Result<Vec<ScVal>, Error> = items
             .iter()
             .zip(value_types.iter())
@@ -1062,7 +1063,7 @@ fn sc_address_from_json(s: &str) -> Result<ScVal, Error> {
 fn to_lower_hex(bytes: &[u8]) -> String {
     let mut res = String::with_capacity(bytes.len());
     for b in bytes {
-        res.push_str(&format!("{b:02x}"));
+        let _ = write!(res, "{b:02x}");
     }
     res
 }

cmd/crates/soroban-spec-tools/src/lib.rs

@@ -146,9 +146,8 @@ mod test {
 
     use super::*;
 
-    const EXAMPLE_WASM: &[u8] = include_bytes!(
-        "../../../../target/wasm32-unknown-unknown/test-wasms/test_custom_types.wasm"
-    );
+    const EXAMPLE_WASM: &[u8] =
+        include_bytes!("../../../../target/wasm32v1-none/test-wasms/test_custom_types.wasm");
 
     fn init(root: impl AsRef<Path>) -> std::io::Result<Project> {
         let spec = soroban_spec::read::from_wasm(EXAMPLE_WASM).unwrap();

cmd/crates/soroban-spec-typescript/src/boilerplate.rs

@@ -281,9 +281,11 @@ pub fn entry_to_method_type(entry: &Entry) -> String {
         Entry::Enum { doc, name, cases } => {
             let doc = doc_to_ts_doc(doc, None, 0);
             let cases = cases.iter().map(enum_case_to_ts).join("\n  ");
-            let name = (name == "Error")
-                .then(|| format!("{name}s"))
-                .unwrap_or(name.to_string());
+            let name = if name == "Error" {
+                format!("{name}s")
+            } else {
+                name.to_string()
+            };
             format!(
                 r"{doc}export enum {name} {{
   {cases}