add --include-versions option

See bytecodealliance/wit-bindgen#1574 for details.

Author: dicej

Cargo.lock

@@ -48,9 +48,8 @@ serde = { version = "1.0.228", features = ["derive"] }
 toml = "1.1.0"
 # TODO: Switch back to upstream once
 # https://github.com/bytecodealliance/wit-bindgen/pull/1572 is merged:
-wit-bindgen-go = { git = "https://github.com/dicej/wit-bindgen", rev = "b163b3b5" }
+wit-bindgen-go = { git = "https://github.com/dicej/wit-bindgen", rev = "661ade1e" }
 wit-component = "0.245.1"
 wit-parser = "0.245.1"
 which = "8.0.2"
 dirs = "6.0.0"
-

Cargo.toml

@@ -12,6 +12,7 @@ pub fn generate_bindings(
     output: Option<&Path>,
     pkg_name: Option<String>,
     export_pkg_name: Option<String>,
+    include_versions: bool,
 ) -> Result<()> {
     let mut files = Default::default();
 
@@ -36,6 +37,7 @@ pub fn generate_bindings(
         format,
         pkg_name,
         export_pkg_name,
+        include_versions,
         ..Default::default()
     }
     .build()

src/cmd_bindings.rs

@@ -176,6 +176,15 @@ pub struct Bindings {
     /// default to that value.
     #[arg(long, requires = "pkg_name")]
     pub export_pkg_name: Option<String>,
+
+    /// When generating Go package names, include the WIT package version even
+    /// if only one version of that package is referenced by the specified
+    /// world.
+    ///
+    /// By default, the version will only be included in the name if the world
+    /// references more than one version of the WIT package.
+    #[arg(long)]
+    pub include_versions: bool,
 }
 
 pub fn run<T: Into<OsString> + Clone, I: IntoIterator<Item = T>>(args: I) -> Result<()> {
@@ -268,5 +277,6 @@ fn bindings(wit_opts: WitOpts, bindings: Bindings) -> Result<()> {
         bindings.output.as_deref(),
         bindings.pkg_name,
         bindings.export_pkg_name,
+        bindings.include_versions,
     )
 }