Skip to content

Commit

Permalink
Fold the wit-bindgen-rust-lib crate into wit-bindgen-rust (#683)
Browse files Browse the repository at this point in the history
* Split `FunctionBindgen` into its own file

* rust: Split interface generation to a separate file

* Move `RustFunctionGenerator` out of `rust-lib`

* Move `RustGenerator` out of `rust-lib`

* Fold the rust-lib crate into the rust crate
  • Loading branch information
alexcrichton authored Sep 28, 2023
1 parent 681da2f commit 0155a52
Show file tree
Hide file tree
Showing 9 changed files with 2,013 additions and 2,119 deletions.
10 changes: 0 additions & 10 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ wit-bindgen-rust = { path = "crates/rust", version = "0.12.0" }
wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.12.0' }
wit-bindgen-go = { path = 'crates/go', version = '0.12.0' }
wit-bindgen-markdown = { path = 'crates/markdown', version = '0.12.0' }
wit-bindgen-rust-lib = { path = 'crates/rust-lib', version = '0.12.0' }
wit-bindgen = { path = 'crates/guest-rust', version = '0.12.0', default-features = false }
wit-bindgen-rust-macro-shared = { path = 'crates/rust-macro-shared', version = '0.3.0' }

Expand Down
19 changes: 0 additions & 19 deletions crates/rust-lib/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion crates/rust-macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ syn = { version = "2.0", features = ["printing"] }
quote = "1"
wit-bindgen-core = { workspace = true }
wit-bindgen-rust = { workspace = true }
wit-bindgen-rust-lib = { workspace = true }
wit-component = { workspace = true }
anyhow = { workspace = true }
3 changes: 1 addition & 2 deletions crates/rust-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ use syn::parse::{Error, Parse, ParseStream, Result};
use syn::punctuated::Punctuated;
use syn::{braced, token, Token};
use wit_bindgen_core::wit_parser::{PackageId, Resolve, UnresolvedPackage, WorldId};
use wit_bindgen_rust::Opts;
use wit_bindgen_rust_lib::Ownership;
use wit_bindgen_rust::{Opts, Ownership};

#[proc_macro]
pub fn generate(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
Expand Down
1 change: 0 additions & 1 deletion crates/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ doctest = false
[dependencies]
anyhow = { workspace = true }
wit-bindgen-core = { workspace = true }
wit-bindgen-rust-lib = { workspace = true }
wit-component = { workspace = true }
wasm-metadata = { workspace = true }
heck = { workspace = true }
Expand Down
Loading

0 comments on commit 0155a52

Please sign in to comment.