itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-09-30 06:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛 Use the proper toolchain version

Browse Source
This commit is contained in:
Sergio Gasquez 2023-06-02 14:12:05 +00:00 committed by Sergio Gasquez Arcos
parent c9e73c4cf4
commit 80538b1c59
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/toolchain/rust.rs
View File

@ -189,12 +189,11 @@ impl Installable for XtensaRust {
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.output()?; .output()?;
let output = String::from_utf8_lossy(&rustc_version.stdout); let output = String::from_utf8_lossy(&rustc_version.stdout);
let toolchain_semver = self.version.rsplit_once('.').unwrap().0; if rustc_version.status.success() && output.contains(&self.version) {
if rustc_version.status.success() && output.contains(toolchain_semver) {
warn!( warn!(
"{} Previous installation of Xtensa Rust {} exists in: '{}'. Reusing this installation.", "{} Previous installation of Xtensa Rust {} exists in: '{}'. Reusing this installation.",
emoji::WARN, emoji::WARN,
toolchain_semver, &self.version,
&self.toolchain_destination.display() &self.toolchain_destination.display()
); );
return Ok(vec![]); return Ok(vec![]);