Bug fixes for targeting a world with resource borrows (#300)

Expanded test cases to cover issue #299

Also, when specifying an exact semver requirement, adds that exact requirement to the generated Cargo.toml. There was mismatch before.

wit-bindgen-rust generates different bindings for borrow<> of resources, depending on whether that type is exported in the world or not. &SomeType vs SomeTypeBorrow in the generated bindings. Fixed the logic here to match that behavior. The revised test case should better cover future potential breakage.

If interested, here is some of the logic on the wit-bindgen side:
https://github.com/bytecodealliance/wit-bindgen/blob/main/crates/rust/src/interface.rs#L2203-L2225

Cargo.toml

@@ -84,9 +84,9 @@ serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 indexmap = "2.2.6"
 url = { version = "2.5.0", features = ["serde"] }
-wit-parser = "0.202.0"
-wit-component = "0.202.0"
-wasm-metadata = "0.202.0"
+wit-parser = "0.208.1"
+wit-component = "0.208.1"
+wasm-metadata = "0.208.1"
 parse_arg = "0.1.4"
 cargo_metadata = "0.18.1"
 cargo-config2 = "0.1.24"
@@ -99,14 +99,14 @@ rpassword = "7.3.1"
 futures = "0.3.30"
 bytes = "1.6.0"
 which = "6.0.1"
-wit-bindgen-rust = "0.24.0"
-wit-bindgen-core = "0.24.0"
+wit-bindgen-rust = "0.25.0"
+wit-bindgen-core = "0.25.0"
 tempfile = "3.10.1"
 assert_cmd = "2.0.14"
 predicates = "3.1.0"
-wasmparser = "0.202.0"
-wat = "1.202.0"
-wasmprinter = "0.202.0"
+wasmparser = "0.208.1"
+wat = "1.208.1"
+wasmprinter = "0.208.1"
 
 [profile.release]
 panic = "abort"

crates/wit/tests/support/mod.rs

@@ -17,7 +17,7 @@ use toml_edit::DocumentMut;
 use warg_crypto::signing::PrivateKey;
 use warg_protocol::operator::NamespaceState;
 use warg_server::{policy::content::WasmContentPolicy, Config, Server};
-use wasmparser::{Chunk, Encoding, Parser, Payload, Validator, WasmFeatures};
+use wasmparser::{Chunk, Encoding, Parser, Payload, Validator};
 
 pub fn test_operator_key() -> &'static str {
     "ecdsa-p256:I+UlDo0HxyBBFeelhPPWmD+LnklOpqZDkrFP5VduASk="
@@ -197,11 +197,7 @@ pub fn validate_component(path: &Path) -> Result<()> {
         .with_context(|| format!("failed to read `{path}`", path = path.display()))?;
 
     // Validate the bytes as either a component or a module
-    Validator::new_with_features(WasmFeatures {
-        component_model: true,
-        ..Default::default()
-    })
-    .validate_all(&bytes)?;
+    Validator::new_with_features(Default::default()).validate_all(&bytes)?;
 
     // Check that the bytes are for a component and not a module
     let mut parser = Parser::new(0);

src/commands/new.rs

@@ -268,17 +268,19 @@ impl NewCommand {
 
         if !self.is_command() {
             if let Some((resolution, world)) = target.as_ref() {
+                // if specifying exact version, set that exact version in the Cargo.toml
+                let version = if !resolution.requirement.comparators.is_empty()
+                    && resolution.requirement.comparators[0].op == semver::Op::Exact
+                {
+                    format!("={}", resolution.version)
+                } else {
+                    format!("{}", resolution.version)
+                };
                 component["target"] = match world {
-                    Some(world) => value(format!(
-                        "{name}/{world}@{version}",
-                        name = resolution.name,
-                        version = resolution.version
-                    )),
-                    None => value(format!(
-                        "{name}@{version}",
-                        name = resolution.name,
-                        version = resolution.version
-                    )),
+                    Some(world) => {
+                        value(format!("{name}/{world}@{version}", name = resolution.name,))
+                    }
+                    None => value(format!("{name}@{version}", name = resolution.name,)),
                 };
             }
         }