Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin'
Browse files Browse the repository at this point in the history
  • Loading branch information
cpetig committed Aug 3, 2024
2 parents 3b47e3a + a20a949 commit a63d226
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 25 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ resolver = "2"

[workspace.package]
edition = "2021"
version = "0.28.0"
version = "0.29.0"
license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
repository = "https://github.com/bytecodealliance/wasi-rs"

Expand All @@ -38,14 +38,14 @@ wasm-metadata = { git = "https://github.com/cpetig/wasm-tools", branch = "symmet
wit-parser = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }
wit-component = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }

wit-bindgen-core = { path = 'crates/core', version = '0.28.0' }
wit-bindgen-c = { path = 'crates/c', version = '0.28.0' }
wit-bindgen-rust = { path = "crates/rust", version = "0.28.0" }
wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.28.0' }
wit-bindgen-go = { path = 'crates/go', version = '0.28.0' }
wit-bindgen-csharp = { path = 'crates/csharp', version = '0.28.0' }
wit-bindgen-markdown = { path = 'crates/markdown', version = '0.28.0' }
wit-bindgen = { path = 'crates/guest-rust', version = '0.28.0', default-features = false }
wit-bindgen-core = { path = 'crates/core', version = '0.29.0' }
wit-bindgen-c = { path = 'crates/c', version = '0.29.0' }
wit-bindgen-rust = { path = "crates/rust", version = "0.29.0" }
wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.29.0' }
wit-bindgen-go = { path = 'crates/go', version = '0.29.0' }
wit-bindgen-csharp = { path = 'crates/csharp', version = '0.29.0' }
wit-bindgen-markdown = { path = 'crates/markdown', version = '0.29.0' }
wit-bindgen = { path = 'crates/guest-rust', version = '0.29.0', default-features = false }

wit-bindgen-cpp = { path = 'crates/cpp', version = '0.3.0' }
wit-bindgen-bridge = { path = 'crates/bridge', version = '0.1.0' }
Expand Down
4 changes: 2 additions & 2 deletions crates/guest-rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Used when compiling Rust programs to the component model.
"""

[dependencies]
wit-bindgen-rust-macro = { path = "./macro", optional = true, version = "0.28.0" }
wit-bindgen-rt = { path = "./rt", version = "0.28.0", features = ["bitflags"] }
wit-bindgen-rust-macro = { path = "./macro", optional = true, version = "0.29.0" }
wit-bindgen-rt = { path = "./rt", version = "0.29.0", features = ["bitflags"] }

[features]
default = ["macros", "realloc"]
Expand Down
4 changes: 2 additions & 2 deletions crates/guest-rust/rt/src/cabi_realloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include <stdint.h>

extern void *cabi_realloc_wit_bindgen_0_28_0(void *ptr, size_t old_size, size_t align, size_t new_size);
extern void *cabi_realloc_wit_bindgen_0_29_0(void *ptr, size_t old_size, size_t align, size_t new_size);

__attribute__((__weak__, __export_name__("cabi_realloc")))
void *cabi_realloc(void *ptr, size_t old_size, size_t align, size_t new_size) {
return cabi_realloc_wit_bindgen_0_28_0(ptr, old_size, align, new_size);
return cabi_realloc_wit_bindgen_0_29_0(ptr, old_size, align, new_size);
}
Binary file modified crates/guest-rust/rt/src/cabi_realloc.o
Binary file not shown.
2 changes: 1 addition & 1 deletion crates/guest-rust/rt/src/cabi_realloc.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is generated by ./ci/rebuild-libcabi-realloc.sh

#[no_mangle]
pub unsafe extern "C" fn cabi_realloc_wit_bindgen_0_28_0(
pub unsafe extern "C" fn cabi_realloc_wit_bindgen_0_29_0(
old_ptr: *mut u8,
old_len: usize,
align: usize,
Expand Down
Binary file modified crates/guest-rust/rt/src/libwit_bindgen_cabi_realloc.a
Binary file not shown.
7 changes: 7 additions & 0 deletions src/bin/wit-bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ struct Common {
/// This enables using `@unstable` annotations in WIT files.
#[clap(long)]
features: Vec<String>,

/// Whether or not to activate all WIT features when processing WIT files.
///
/// This enables using `@unstable` annotations in WIT files.
#[clap(long)]
all_features: bool,
}

fn main() -> Result<()> {
Expand Down Expand Up @@ -202,6 +208,7 @@ fn gen_world(
files: &mut Files,
) -> Result<()> {
let mut resolve = Resolve::default();
resolve.all_features = opts.all_features;
for features in opts.features.iter() {
for feature in features
.split(',')
Expand Down

0 comments on commit a63d226

Please sign in to comment.