Skip to content

Update to the latest wit-bindgen #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 27, 2025
Merged

Update to the latest wit-bindgen #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7990a59
Update to the latest `wit-bindgen`
alexcrichton Aug 26, 2025
c383069
Update `link_section` outputs in generated code
alexcrichton Aug 27, 2025
854547e
Update to crates.io-based versions
alexcrichton Aug 27, 2025
42ecd1b
Regenerate files with 0.45.0
alexcrichton Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ jobs:
run: |
./ci/vendor-wit.sh
git diff --exit-code
- run: cargo install wit-bindgen-cli@0.39.0 --locked
- run: cargo install wit-bindgen-cli@0.45.0 --locked
- run: ./ci/regenerate.sh
- run: git diff --exit-code
9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@ wasi = { version = "0.14", path = ".", default-features = false }
members = ["./crates/*"]

[dependencies]
wit-bindgen-rt = { version = "0.39.0", features = ["bitflags"] }
wit-bindgen = { version = "0.45.0", default-features = false }

# When built as part of libstd
core = { version = "1.0", optional = true, package = "rustc-std-workspace-core" }
rustc-std-workspace-alloc = { version = "1.0", optional = true }
alloc = { version = "1.0", optional = true, package = "rustc-std-workspace-alloc" }

[features]
default = ["std"]
default = ["std", "bitflags"]
std = []
bitflags = ["wit-bindgen/bitflags"]
# Unstable feature to support being a libstd dependency
rustc-dep-of-std = ["core", "rustc-std-workspace-alloc"]
rustc-dep-of-std = ["core", "alloc", "wit-bindgen/rustc-dep-of-std"]

[[example]]
name = "cli-command-no_std"
Expand Down
8 changes: 6 additions & 2 deletions ci/regenerate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ set -ex
generate() {
file="$1"
shift
wit-bindgen rust wit --async none --out-dir src --std-feature "$@" --format \
--runtime-path wit_bindgen_rt
wit-bindgen rust wit --out-dir src --std-feature "$@" --format

sed -z -i 's/#\[unsafe(\n link_section = "\(.*\)"\n)\]/\
#[cfg_attr(feature = "rustc-dep-of-std", unsafe(link_section = "\1-in-libstd"))]\
#[cfg_attr(not(feature = "rustc-dep-of-std"), unsafe(link_section = "\1"))]\
/' $file
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use wit-bindgen's --type-section-suffix flag to add the suffix?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh we actually already use it but the problem here is that it needs a different suffix depending on whether rustc-dep-of-std is enabled or not (to have one name when depended on by libstd and another name when normally used from crates.io)

}

# Generate the main body of the bindings which includes all imports from the two
Expand Down
Loading