fix: Complete incompleted Xtensa Rust versions

esp-rs · Oct 4, 2023 · 09b94cd · 09b94cd
1 parent 02ac046
commit 09b94cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 ### Fixed
+- Complete Xtensa Rust versions when provided one is incompleted (#366)
 
 ### Removed
 

diff --git a/src/main.rs b/src/main.rs
@@ -8,7 +8,7 @@ use espup::{
     logging::initialize_logger,
     toolchain::{
         gcc::uninstall_gcc_toolchains, install as toolchain_install, llvm::Llvm,
-        rust::get_rustup_home, rust::XtensaRust,
+        rust::get_rustup_home,
     },
     update::check_for_update,
 };
@@ -64,13 +64,6 @@ async fn install(args: InstallOpts) -> Result<()> {
     initialize_logger(&args.log_level);
     check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
 
-    // Check if the toolchain version is valid if we are not skipping the version parse
-    if let Some(toolchain_version) = &args.toolchain_version {
-        if !args.skip_version_parse {
-            XtensaRust::parse_version(toolchain_version)?;
-        }
-    }
-
     info!("{} Installing the Espressif Rust ecosystem", emoji::DISC);
     toolchain_install(args).await?;
     info!("{} Installation successfully completed!", emoji::CHECK);
@@ -109,13 +102,6 @@ async fn update(args: InstallOpts) -> Result<()> {
     initialize_logger(&args.log_level);
     check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
 
-    // Check if the toolchain version is valid if we are not skipping the version parse
-    if let Some(toolchain_version) = &args.toolchain_version {
-        if !args.skip_version_parse {
-            XtensaRust::parse_version(toolchain_version)?;
-        }
-    }
-
     info!("{} Updating Espressif Rust ecosystem", emoji::DISC);
     toolchain_install(args).await?;
     info!("{} Update successfully completed!", emoji::CHECK);

diff --git a/src/toolchain/mod.rs b/src/toolchain/mod.rs
@@ -148,7 +148,11 @@ pub async fn install(args: InstallOpts) -> Result<()> {
     let mut exports: Vec<String> = Vec::new();
     let host_triple = get_host_triple(args.default_host)?;
     let xtensa_rust_version = if let Some(toolchain_version) = &args.toolchain_version {
-        toolchain_version.clone()
+        if !args.skip_version_parse {
+            XtensaRust::parse_version(toolchain_version)?
+        } else {
+            toolchain_version.clone()
+        }
     } else {
         XtensaRust::get_latest_version().await?
     };
@@ -180,6 +184,7 @@ pub async fn install(args: InstallOpts) -> Result<()> {
             - LLVM Toolchain: {:?}
             - Nightly version: {:?}
             - Rust Toolchain: {:?}
+            - Skip version parsing: {}
             - Targets: {:?}
             - Toolchain path: {:?}
             - Toolchain version: {:?}",
@@ -189,6 +194,7 @@ pub async fn install(args: InstallOpts) -> Result<()> {
         &llvm,
         &args.nightly_version,
         xtensa_rust,
+        &args.skip_version_parse,
         targets,
         &install_path,
         args.toolchain_version,