Point at fork of wasmtime-macro

Author: Mark-Simulacrum

Cargo.lock

@@ -7039,7 +7039,7 @@ dependencies = [
  "wasmparser 0.251.0",
  "wasmtime-environ",
  "wasmtime-internal-component-macro",
- "wasmtime-internal-component-util",
+ "wasmtime-internal-component-util 46.0.0",
  "wasmtime-internal-core",
  "wasmtime-internal-cranelift",
  "wasmtime-internal-fiber",
@@ -7077,21 +7077,19 @@ dependencies = [
  "wasm-encoder 0.251.0",
  "wasmparser 0.251.0",
  "wasmprinter",
- "wasmtime-internal-component-util",
+ "wasmtime-internal-component-util 46.0.0",
  "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "wasmtime-internal-component-macro"
 version = "46.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de4451ab437d7b2d41e637a4379e87ff76aeeb051236064dcc75c1855714ee58"
 dependencies = [
  "anyhow",
  "proc-macro2",
  "quote",
  "syn",
- "wasmtime-internal-component-util",
+ "wasmtime-internal-component-util 47.0.0",
  "wasmtime-internal-wit-bindgen",
  "wit-parser 0.251.0",
 ]
@@ -7102,6 +7100,10 @@ version = "46.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53b5e357002645964342b99a6fe8405cda7dd031f498927992c9d99d5012daa7"
 
+[[package]]
+name = "wasmtime-internal-component-util"
+version = "47.0.0"
+
 [[package]]
 name = "wasmtime-internal-core"
 version = "46.0.0"
@@ -7203,9 +7205,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-wit-bindgen"
-version = "46.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859103d8336304b8beebbf89a620c2f53a118fd5fbce41bc572cf4bacc8111d"
+version = "47.0.0"
 dependencies = [
  "anyhow",
  "bitflags",

Cargo.toml

@@ -91,5 +91,5 @@ codegen-units = 1
 
 # If you want to use a crate with local modifications, you can set a path or git dependency here.
 # For git dependencies, also add your source to ALLOWED_SOURCES in src/tools/tidy/src/extdeps.rs.
-#[patch.crates-io]
-
+[patch.crates-io]
+wasmtime-internal-component-macro = { path = "../wasmtime/crates/component-macro" }

rustfmt.toml

@@ -47,6 +47,7 @@ ignore = [
     "src/tools/rustc-perf",
     "src/tools/rustfmt",
     "src/gcc",
+    "vendored",
 
     # These are ignored by a standard cargo fmt run.
     "compiler/rustc_codegen_cranelift/scripts",

vendored/component-macro/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "wasmtime-internal-component-macro"
+version = "46.0.0"
+description = "INTERNAL: Macros for deriving component interface types from Rust types"
+license = "Apache-2.0 WITH LLVM-exception"
+repository = "https://github.com/bytecodealliance/wasmtime"
+documentation = "https://docs.rs/wasmtime-component-macro/"
+categories = ["wasm"]
+keywords = ["webassembly", "wasm"]
+edition = "2024"
+
+[lib]
+proc-macro = true
+test = false
+doctest = false
+
+[dependencies]
+anyhow = "1"
+proc-macro2 = "1"
+quote = "1"
+syn = { version = "1", features = ["extra-traits"] }
+wasmtime-component-util = { version = "46.0.0", package = 'wasmtime-internal-component-util' }
+wasmtime-wit-bindgen = { version = "46.0.0", package = 'wasmtime-internal-wit-bindgen' }
+wasmtime-wit-bindgen = { version = "46.0.0", package = 'wasmtime-internal-wit-bindgen' }
+wit-parser = "0.251.0"
+
+[features]
+async = ['wasmtime-wit-bindgen/async']
+component-model-async = ['async', 'wasmtime-wit-bindgen/component-model-async']

vendored/component-macro/build.rs

@@ -0,0 +1,5 @@
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+    let out_dir = std::env::var("OUT_DIR").unwrap();
+    println!("cargo:rustc-env=DEBUG_OUTPUT_DIR={out_dir}");
+}