update

gear-tech · Apr 25, 2024 · 85aa467 · 85aa467
1 parent 6571219
commit 85aa467
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/utils/wasm-builder/src/crate_info.rs b/utils/wasm-builder/src/crate_info.rs
@@ -18,7 +18,7 @@
 
 use anyhow::{Context, Result};
 use cargo_metadata::{Metadata, MetadataCommand, Package};
-use rustc_version::{version, version_meta, Channel, Version};
+use rustc_version::{version, Version};
 use std::{collections::BTreeMap, path::Path};
 
 use crate::builder_error::BuilderError;
@@ -87,16 +87,19 @@ impl CrateInfo {
         //
         // see also https://doc.rust-lang.org/reference/linkage.html
         let validated_lib = |ty: &String| ty == "lib" || ty == "rlib";
+        let pkg_snake_case_name = pkg.name.replace('-', "_");
+        let rustc_version = Version::parse("1.79.0").unwrap();
+
         let _ = pkg
             .targets
             .iter()
             .find(|target| {
                 // Check for rustc version. See https://github.com/rust-lang/cargo/pull/12783
-                if version().unwrap() >= Version::parse("1.78.0").unwrap() {
-                    let pkg_snake_case_name = pkg.name.replace('-', "_");
-                    target.name.eq(&pkg_snake_case_name) && target.crate_types.iter().any(validated_lib)
-                } else {
+                if version().unwrap() < rustc_version {
                     target.name.eq(&pkg.name) && target.crate_types.iter().any(validated_lib)
+                } else {
+                    target.name.eq(&pkg_snake_case_name)
+                        && target.crate_types.iter().any(validated_lib)
                 }
             })
             .ok_or(BuilderError::CrateTypeInvalid)?;