Merge branch 'bytecodealliance:main' into dlang

Author: QuantumSegfault

.github/workflows/main.yml

@@ -169,6 +169,19 @@ jobs:
     - run: rustup target add wasm32-wasip2
 
     - uses: ./.github/actions/install-wasi-sdk
+
+    # The threading builtins are encoded with a canonical-function opcode
+    # newer than any released wasmtime understands (46.0.1 and 47.0.2 both
+    # reject it with "invalid leading byte (0x2d) for canonical function"),
+    # so this job runs wasmtime's `dev` build instead of the pinned release.
+    # This can go back to the shared pin once a release parses the encoding.
+    - name: Install wasmtime dev build
+      run: |
+        curl --retry 5 --retry-all-errors -L -o wasmtime-dev.tar.xz https://github.com/bytecodealliance/wasmtime/releases/download/dev/wasmtime-dev-x86_64-linux.tar.xz
+        tar xJf wasmtime-dev.tar.xz
+        echo "`pwd`/wasmtime-dev-x86_64-linux" >> $GITHUB_PATH
+      working-directory: ${{ runner.temp }}
+
     - run: |
         cargo run test --languages rust,c,go tests/threading \
           --artifacts target/artifacts \
@@ -189,6 +202,7 @@ jobs:
     - run: cargo test -p wit-bindgen
     - run: cargo test -p wit-bindgen --all-features
     - run: cargo test -p wit-bindgen-rust
+    - run: cargo test -p wit-bindgen-markdown
     - run: cargo test --workspace --exclude 'wit-bindgen*'
     - run: rustup update nightly-2025-11-10 --no-self-update
     - run: rustup default nightly-2025-11-10

Cargo.lock

@@ -40,20 +40,21 @@ bitflags = "2.11.1"
 heck = { version = "0.5" }
 pulldown-cmark = { version = "0.13.3", default-features = false }
 serde = { version = "1.0.228", features = ["derive"] }
+serde_json = { version = "1" }
 clap = { version = "4.6.1", features = ["derive"] }
 indexmap = "2.0.0"
 prettyplease = "0.2.20"
 syn = { version = "2.0.89", features = ["printing"] }
 futures = "0.3.31"
 macro-string = "0.2.0"
 
-wat = "1.254.0"
-wasmparser = "0.254.0"
-wasm-encoder = "0.254.0"
-wasm-metadata = { version = "0.254.0", default-features = false }
-wit-parser = "0.254.0"
-wit-component = "0.254.0"
-wasm-compose = "0.254.0"
+wat = "1.257.0"
+wasmparser = "0.257.0"
+wasm-encoder = "0.257.0"
+wasm-metadata = { version = "0.257.0", default-features = false }
+wit-parser = "0.257.0"
+wit-component = "0.257.0"
+wasm-compose = "0.257.0"
 
 wit-bindgen-core = { path = 'crates/core', version = '0.60.0' }
 wit-bindgen-c = { path = 'crates/c', version = '0.60.0' }

Cargo.toml

@@ -42,6 +42,8 @@ set -ex
 version=$(./ci/print-current-version.sh | sed 's/\./_/g')
 
 realloc=cabi_realloc_wit_bindgen_$version
+wasip3_get=wit_bindgen_${version}_get_task_context
+wasip3_set=wit_bindgen_${version}_set_task_context
 
 rm -f crates/guest-rust/src/rt/wit_bindgen_*.{rs,o,c}
 rm -f crates/guest-rust/src/rt/libwit_bindgen_cabi.a
@@ -60,6 +62,17 @@ pub unsafe extern "C" fn $realloc(
 }
 EOF
 
+cat >./crates/guest-rust/src/rt/async_support/wasip3_context.rs <<-EOF
+// This file is generated by $0
+
+unsafe extern "C" {
+    #[link_name = "$wasip3_get"]
+    pub fn get() -> *mut u8;
+    #[link_name = "$wasip3_set"]
+    pub fn set(ptr: *mut u8);
+}
+EOF
+
 cat >./crates/guest-rust/src/rt/wit_bindgen_cabi_realloc.c <<-EOF
 // This file is generated by $0
 
@@ -86,6 +99,16 @@ void *wasip3_task_set(void *ptr) {
   WASIP3_TASK = ptr;
   return ret;
 }
+
+static _Thread_local void *task_context = NULL;
+
+void *$wasip3_get(void) {
+  return task_context;
+}
+
+void $wasip3_set(void *ptr) {
+  task_context = ptr;
+}
 EOF
 
 build() {

ci/rebuild-libwit-bindgen-cabi.sh

@@ -49,6 +49,16 @@ impl Source {
     }
 
     pub fn push_str(&mut self, src: &str) {
+        self.push_str_impl(src, true);
+    }
+
+    /// Appends literal text with the current indentation without interpreting
+    /// braces or line comments as source syntax.
+    pub fn push_str_literal(&mut self, src: &str) {
+        self.push_str_impl(src, false);
+    }
+
+    fn push_str_impl(&mut self, src: &str, interpret_syntax: bool) {
         let lines = src.lines().collect::<Vec<_>>();
         for (i, line) in lines.iter().enumerate() {
             if !self.continuing_line {
@@ -61,11 +71,11 @@ impl Source {
             }
 
             let trimmed = line.trim();
-            if trimmed.starts_with("//") {
+            if interpret_syntax && trimmed.starts_with("//") {
                 self.in_line_comment = true;
             }
 
-            if !self.in_line_comment {
+            if interpret_syntax && !self.in_line_comment {
                 if trimmed.starts_with('}') && self.s.ends_with("  ") {
                     self.s.pop();
                     self.s.pop();
@@ -76,7 +86,7 @@ impl Source {
             } else {
                 line.trim_start()
             });
-            if !self.in_line_comment {
+            if interpret_syntax && !self.in_line_comment {
                 if trimmed.ends_with('{') {
                     self.indent += 1;
                 }
@@ -219,4 +229,13 @@ mod tests {
         );
         assert_eq!(s.s, "function() {\n  x\n}");
     }
+
+    #[test]
+    fn literal_text_does_not_change_indentation() {
+        let mut s = Source::default();
+        s.indent(1);
+        s.push_str_literal("}\n{");
+        s.deindent(1);
+        assert_eq!(s.s, "  }\n  {");
+    }
 }