Update how WIT is parsed with new helpers (#837)

alexcrichton · web-flow · commit 3faf486e3999 · 2024-02-13T16:35:06.000-06:00
* Update how WIT is parsed throughout

Use the `Resolve::push_path` API added recently to wasm-tools to support
more forms of input directories.

* Bump crates to 0.18.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen-cli"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-version = "0.17.1"
+version = "0.18.0"
 edition = { workspace = true }
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
@@ -34,14 +34,14 @@ wasm-metadata = "0.10.20"
 wit-parser = "0.14.0"
 wit-component = "0.21.0"
 
-wit-bindgen-core = { path = 'crates/core', version = '0.17.1' }
-wit-bindgen-c = { path = 'crates/c', version = '0.17.1' }
-wit-bindgen-rust = { path = "crates/rust", version = "0.17.1" }
-wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.17.1' }
-wit-bindgen-go = { path = 'crates/go', version = '0.17.1' }
-wit-bindgen-csharp = { path = 'crates/csharp', version = '0.17.1' }
-wit-bindgen-markdown = { path = 'crates/markdown', version = '0.17.1' }
-wit-bindgen = { path = 'crates/guest-rust', version = '0.17.1', default-features = false }
+wit-bindgen-core = { path = 'crates/core', version = '0.18.0' }
+wit-bindgen-c = { path = 'crates/c', version = '0.18.0' }
+wit-bindgen-rust = { path = "crates/rust", version = "0.18.0" }
+wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.18.0' }
+wit-bindgen-go = { path = 'crates/go', version = '0.18.0' }
+wit-bindgen-csharp = { path = 'crates/csharp', version = '0.18.0' }
+wit-bindgen-markdown = { path = 'crates/markdown', version = '0.18.0' }
+wit-bindgen = { path = 'crates/guest-rust', version = '0.18.0', default-features = false }
 
 [[bin]]
 name = "wit-bindgen"
diff --git a/crates/c/Cargo.toml b/crates/c/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen-c"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen-core"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
@@ -17,4 +17,3 @@ doctest = false
 [dependencies]
 wit-parser = { workspace = true }
 anyhow = { workspace = true }
-wit-component = { workspace = true }
diff --git a/crates/csharp/Cargo.toml b/crates/csharp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen-csharp"
 authors = ["Timmy Silesmo <silesmo@nor2.io>"]
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
diff --git a/crates/csharp/src/lib.rs b/crates/csharp/src/lib.rs
@@ -1,7 +1,7 @@
 mod component_type_object;
 
 use anyhow::Result;
-use heck::{ToLowerCamelCase, ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
+use heck::{ToLowerCamelCase, ToShoutySnakeCase, ToUpperCamelCase};
 use std::{
     collections::{HashMap, HashSet},
     fmt::Write,
@@ -17,7 +17,7 @@ use wit_bindgen_core::{
     uwrite, uwriteln,
     wit_parser::{
         Docs, Enum, Flags, FlagsRepr, Function, FunctionKind, Int, InterfaceId, Record, Resolve,
-        Result_, SizeAlign, Tuple, Type, TypeDef, TypeDefKind, TypeId, TypeOwner, Variant, WorldId,
+        Result_, SizeAlign, Tuple, Type, TypeDefKind, TypeId, TypeOwner, Variant, WorldId,
         WorldKey,
     },
     Files, InterfaceGenerator as _, Ns, WorldGenerator,
@@ -338,15 +338,15 @@ impl WorldGenerator for CSharp {
                     public bool IsOk => Tag == OK;
                     public bool IsErr => Tag == ERR;
 
-                    public Ok AsOk 
-                    { 
-                        get 
+                    public Ok AsOk
+                    {
+                        get
                         {
-                            if (Tag == OK) 
+                            if (Tag == OK)
                                 return (Ok)_value;
-                            else 
+                            else
                                 throw new ArgumentException("expected OK, got " + Tag);
-                        } 
+                        }
                     }
 
                     public Err AsErr
@@ -406,7 +406,7 @@ impl WorldGenerator for CSharp {
                     private struct ReturnArea
                     {{
                         private byte buffer;
-    
+
                         private int GetS32(int offset)
                         {{
                             ReadOnlySpan<byte> span = MemoryMarshal.CreateSpan(ref buffer, {0});
@@ -424,7 +424,7 @@ impl WorldGenerator for CSharp {
                         public void SetF32(int offset, float value)
                         {{
                             Span<byte> span = this;
-                            
+
                             BitConverter.TryWriteBytes(span.Slice(offset), value);
                         }}
 
@@ -441,7 +441,7 @@ impl WorldGenerator for CSharp {
                             return Encoding.UTF8.GetString((byte*)p0, p1);
                         }}
                     }}
-    
+
                     [ThreadStatic]
                     private static ReturnArea returnArea = default;
                     ",
@@ -478,7 +478,7 @@ impl WorldGenerator for CSharp {
                 /* of WASI libc prevent us doing so. */
                 /* See https://github.com/bytecodealliance/wit-bindgen/issues/777  */
                 /* and https://github.com/WebAssembly/wasi-libc/issues/452 */
-                /* The component model `start` function might be an alternative to this depending on whether it 
+                /* The component model `start` function might be an alternative to this depending on whether it
                 /* has the same constraints as `cabi_realloc` */
                 __attribute__((__weak__, __export_name__("cabi_realloc")))
                 void *cabi_realloc(void *ptr, size_t old_size, size_t align, size_t new_size) {
@@ -535,7 +535,7 @@ impl WorldGenerator for CSharp {
             let body = format!(
                 "// Generated by `wit-bindgen` {version}. DO NOT EDIT!
                 {CSHARP_IMPORTS}
-                
+
                 namespace {fully_qualified_namespace};
 
                  public partial class {stub_class_name} : {interface_or_class_name} {{
@@ -614,7 +614,7 @@ impl WorldGenerator for CSharp {
                     {CSHARP_IMPORTS}
 
                     namespace {namespace};
-        
+
                     public interface {interface_name} {{
                         {body}
                     }}
@@ -839,14 +839,14 @@ impl InterfaceGenerator<'_> {
                     private struct ReturnArea
                     {{
                         private byte buffer;
-    
+
                         private int GetS32(int offset)
                         {{
                             ReadOnlySpan<byte> span = MemoryMarshal.CreateSpan(ref buffer, {0});
 
                             return BitConverter.ToInt32(span.Slice(offset, 4));
                         }}
-                        
+
                         public void SetS8(int offset, int value)
                         {{
                             Span<byte> span = MemoryMarshal.CreateSpan(ref buffer, {0});
@@ -871,7 +871,7 @@ impl InterfaceGenerator<'_> {
                         public void SetF32(int offset, float value)
                         {{
                             Span<byte> span = this;
-                            
+
                             BitConverter.TryWriteBytes(span.Slice(offset), value);
                         }}
 
@@ -888,7 +888,7 @@ impl InterfaceGenerator<'_> {
                             return Encoding.UTF8.GetString((byte*)p0, p1);
                         }}
                     }}
-    
+
                     [ThreadStatic]
                     private static ReturnArea returnArea = default;
                     ",
diff --git a/crates/go/Cargo.toml b/crates/go/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen-go"
 authors = ["Mossaka <duibao55328@gmail.com>"]
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
diff --git a/crates/guest-rust/Cargo.toml b/crates/guest-rust/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
@@ -12,7 +12,7 @@ Used when compiling Rust programs to the component model.
 """
 
 [dependencies]
-wit-bindgen-rust-macro = { path = "../rust-macro", optional = true, version = "0.17.1" }
+wit-bindgen-rust-macro = { path = "../rust-macro", optional = true, version = "0.18.0" }
 bitflags = { workspace = true }
 
 [features]
diff --git a/crates/markdown/Cargo.toml b/crates/markdown/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wit-bindgen-markdown"
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
diff --git a/crates/rust-macro/Cargo.toml b/crates/rust-macro/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen-rust-macro"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
@@ -21,5 +21,4 @@ syn = { version = "2.0", features = ["printing"] }
 quote = "1"
 wit-bindgen-core = { workspace = true }
 wit-bindgen-rust = { workspace = true }
-wit-component = { workspace = true }
 anyhow = { workspace = true }
diff --git a/crates/rust-macro/src/lib.rs b/crates/rust-macro/src/lib.rs
@@ -123,20 +123,14 @@ fn parse_source(source: &Option<Source>) -> anyhow::Result<(Resolve, PackageId,
     let mut files = Vec::new();
     let root = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
     let mut parse = |path: &Path| -> anyhow::Result<_> {
-        if path.is_dir() {
-            let (pkg, sources) = resolve.push_dir(path)?;
-            files = sources;
-            Ok(pkg)
-        } else {
-            let pkg = UnresolvedPackage::parse_file(path)?;
-            files.extend(pkg.source_files().map(|s| s.to_owned()));
-            resolve.push(pkg)
-        }
+        let (pkg, sources) = resolve.push_path(path)?;
+        files.extend(sources);
+        Ok(pkg)
     };
     let pkg = match source {
         Some(Source::Inline(s, path)) => {
             if let Some(p) = path {
-                resolve.push_dir(p).unwrap();
+                parse(&root.join(p))?;
             }
             resolve.push(UnresolvedPackage::parse("macro-input".as_ref(), s)?)?
         }
diff --git a/crates/rust/Cargo.toml b/crates/rust/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wit-bindgen-rust"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
diff --git a/crates/teavm-java/Cargo.toml b/crates/teavm-java/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wit-bindgen-teavm-java"
-version = "0.17.1"
+version = "0.18.0"
 edition.workspace = true
 repository = 'https://github.com/bytecodealliance/wit-bindgen'
 license = "Apache-2.0 WITH LLVM-exception"
diff --git a/crates/test-helpers/src/lib.rs b/crates/test-helpers/src/lib.rs
diff --git a/src/bin/wit-bindgen.rs b/src/bin/wit-bindgen.rs
diff --git a/tests/runtime/main.rs b/tests/runtime/main.rs
diff --git a/tests/runtime/other-dependencies/wasm.rs b/tests/runtime/other-dependencies/wasm.rs
diff --git a/tests/runtime/resource_alias/wasm.rs b/tests/runtime/resource_alias/wasm.rs
