sc-meta - version fixes

framework/derive/src/format/semver_tuple.rs

@@ -32,7 +32,12 @@ fn convert_token_tree(token: &proc_macro2::TokenTree) -> proc_macro2::TokenStrea
 }
 
 fn u64_literal_from_str(s: &str) -> proc_macro2::TokenTree {
+    // For some reason a space creeps in at the end,
+    // but only when running from rust-analyzer,
+    // therefore also calling a trim()
     proc_macro2::TokenTree::Literal(proc_macro2::Literal::u64_suffixed(
-        s.parse().expect("failed to parse token as u64"),
+        s.trim()
+            .parse()
+            .unwrap_or_else(|err| panic!("failed to parse token as u64 '{s}': {err}")),
     ))
 }

framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs

@@ -358,10 +358,10 @@ mod tests {
 
     const CARGO_TOML_RAW: &str = r#"
 [dependencies.by-version-1]
-version = "1.2.30"
+version = "0.54.0"
 
 [dependencies.by-version-1-strict]
-version = "=1.2.31"
+version = "=0.54.1"
 
 [dependencies.by-git-commit-1]
 git = "https://github.com/multiversx/repo1"
@@ -371,8 +371,8 @@ rev = "85c31b9ce730bd5ffe41589c353d935a14baaa96"
 path = "a/b/c"
 
 [dependencies]
-by-version-2 = "4.5.60"
-by-version-2-strict = "=4.5.61"
+by-version-2 = "0.54.2"
+by-version-2-strict = "=0.54.3"
 by-path-2 = { path = "d/e/f" }
 by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be823f26d1e7f59c71536d337b7240dc3fa2" }
     "#;
@@ -386,13 +386,13 @@ by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be82
         assert_eq!(
             raw_value,
             DependencyRawValue {
-                version: Some("1.2.30".to_owned()),
+                version: Some("0.54.0".to_owned()),
                 ..Default::default()
             },
         );
         assert_eq!(
             raw_value.interpret(),
-            DependencyReference::Version(VersionReq::from_version_str("1.2.30")),
+            DependencyReference::Version(VersionReq::from_version_str("0.54.0").unwrap()),
         );
 
         // version, strict
@@ -402,27 +402,27 @@ by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be82
         assert_eq!(
             raw_value,
             DependencyRawValue {
-                version: Some("=1.2.31".to_owned()),
+                version: Some("=0.54.1".to_owned()),
                 ..Default::default()
             },
         );
         assert_eq!(
             raw_value.interpret(),
-            DependencyReference::Version(VersionReq::from_version_str("1.2.31").strict()),
+            DependencyReference::Version(VersionReq::from_version_str("0.54.1").unwrap().strict()),
         );
 
         // version, compact
         let raw_value = cargo_toml.dependency_raw_value("by-version-2").unwrap();
         assert_eq!(
             raw_value,
             DependencyRawValue {
-                version: Some("4.5.60".to_owned()),
+                version: Some("0.54.2".to_owned()),
                 ..Default::default()
             },
         );
         assert_eq!(
             raw_value.interpret(),
-            DependencyReference::Version(VersionReq::from_version_str("4.5.60")),
+            DependencyReference::Version(VersionReq::from_version_str("0.54.2").unwrap()),
         );
 
         // version, compact, strict
@@ -432,13 +432,13 @@ by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be82
         assert_eq!(
             raw_value,
             DependencyRawValue {
-                version: Some("=4.5.61".to_owned()),
+                version: Some("=0.54.3".to_owned()),
                 ..Default::default()
             },
         );
         assert_eq!(
             raw_value.interpret(),
-            DependencyReference::Version(VersionReq::from_version_str("4.5.61").strict()),
+            DependencyReference::Version(VersionReq::from_version_str("0.54.3").unwrap().strict()),
         );
 
         // git

framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs

@@ -31,7 +31,7 @@ pub enum DependencyReference {
     GitBranch(GitBranchReference),
     GitTag(GitTagReference),
     Path(String),
-    Unsupported(&'static str),
+    Unsupported(String),
 }
 
 impl DependencyReference {
@@ -66,20 +66,26 @@ impl DependencyRawValue {
                 },
 
                 (None, None, None) => DependencyReference::Unsupported(
-                    "need at least one of: git commit, git brach, or git tag",
+                    "need at least one of: git commit, git brach, or git tag".to_owned(),
                 ),
                 _ => DependencyReference::Unsupported(
-                    "can only have one of: git commit, git brach, or git tag",
+                    "can only have one of: git commit, git brach, or git tag".to_owned(),
                 ),
             };
         }
 
         // explicit version = "..."
         // handled last, because it has the lowest priority, both path and git fields override it
         if let Some(version) = self.version {
-            return DependencyReference::Version(VersionReq::from_version_str(&version));
+            if let Some(version_req) = VersionReq::from_version_str(&version) {
+                return DependencyReference::Version(version_req);
+            } else {
+                return DependencyReference::Unsupported(format!(
+                    "unknown framework version: {version}"
+                ));
+            }
         }
 
-        DependencyReference::Unsupported("expected at least one of: version, git, path")
+        DependencyReference::Unsupported("expected at least one of: version, git, path".to_owned())
     }
 }

framework/meta-lib/src/cargo_toml/version_req.rs

@@ -12,7 +12,21 @@ pub struct VersionReq {
     pub is_strict: bool,
 }
 impl VersionReq {
-    pub fn from_version_str(raw: &str) -> Self {
+    pub fn from_version_str(raw: &str) -> Option<Self> {
+        if let Some(stripped_version) = raw.strip_prefix('=') {
+            Some(VersionReq {
+                semver: find_version_by_str(stripped_version)?.clone(),
+                is_strict: true,
+            })
+        } else {
+            Some(VersionReq {
+                semver: find_version_by_str(raw)?.clone(),
+                is_strict: false,
+            })
+        }
+    }
+
+    pub fn from_version_str_or_latest(raw: &str) -> Self {
         if let Some(stripped_version) = raw.strip_prefix('=') {
             VersionReq {
                 semver: find_version_by_str(stripped_version)

framework/meta-lib/src/version_history.rs

@@ -86,6 +86,9 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.53.1,
     0.53.2,
     0.54.0,
+    0.54.1,
+    0.54.2,
+    0.54.3,
     0.54.4,
 ];
 
@@ -114,10 +117,6 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.51.1,
     0.52.3,
     0.53.2,
-    0.54.0,
-    0.54.1,
-    0.54.2,
-    0.54.3,
     0.54.4,
 ];
 

framework/meta/src/cmd/upgrade/upgrade_common.rs

@@ -179,7 +179,7 @@ fn change_version_string(
     framework_crate_name: &str,
 ) {
     let version_string_before = version_string.clone();
-    let mut version_spec = VersionReq::from_version_str(&std::mem::take(version_string));
+    let mut version_spec = VersionReq::from_version_str_or_latest(&std::mem::take(version_string));
     if version_spec.semver == *from_version {
         version_spec.semver = to_version.clone();
     }