old toolchain support

Author: Firestar99

Cargo.lock

@@ -13,7 +13,7 @@ exclude = [
 resolver = "2"
 
 [workspace.dependencies]
-spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "e040ab9c296f2c0f1555051d4b574969329715ec", default-features = false }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "eca83dfbfc0aae5c72f1e3f53081f5ccb72c27a4", default-features = false }
 anyhow = "1.0.94"
 clap = { version = "4.5.37", features = ["derive"] }
 crossterm = "0.28.1"
@@ -27,6 +27,7 @@ toml = "0.8.19"
 tempdir = "0.3.7"
 test-log = "0.2.16"
 cargo_metadata = "0.19.2"
+semver = "1.0.26"
 
 [workspace.lints.rust]
 missing_docs = "warn"

Cargo.toml

@@ -22,7 +22,7 @@ relative-path.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 crossterm.workspace = true
-version_check = "0.9.5"
+semver.workspace = true
 
 [dev-dependencies]
 test-log.workspace = true

crates/cargo-gpu/Cargo.toml

@@ -4,6 +4,7 @@
 
 use crate::args::BuildArgs;
 use crate::linkage::Linkage;
+use crate::lockfile::LockfileMismatchHandler;
 use crate::{install::Install, target_spec_dir};
 use anyhow::Context as _;
 use spirv_builder::ModuleResult;
@@ -27,6 +28,14 @@ impl Build {
     pub fn run(&mut self) -> anyhow::Result<()> {
         let (rustc_codegen_spirv_location, toolchain_channel) = self.install.run()?;
 
+        let _lockfile_mismatch_handler = LockfileMismatchHandler::new(
+            &self.install.spirv_install.shader_crate,
+            &toolchain_channel,
+            self.install
+                .spirv_install
+                .force_overwrite_lockfiles_v4_to_v3,
+        )?;
+
         let builder = &mut self.build_args.spirv_builder;
         builder.rustc_codegen_spirv_location = Some(rustc_codegen_spirv_location);
         builder.toolchain_overwrite = Some(toolchain_channel);

crates/cargo-gpu/src/build.rs

@@ -2,11 +2,13 @@
 //! Then ensure that the relevant Rust toolchain and components are installed.
 
 use anyhow::Context as _;
+use semver::Version;
+use spirv_builder::query_rustc_version;
 use std::io::Write as _;
 
 /// `Cargo.lock` manifest version 4 became the default in Rust 1.83.0. Conflicting manifest
 /// versions between the workspace and the shader crate, can cause problems.
-const RUST_VERSION_THAT_USES_V4_CARGO_LOCKS: &str = "1.83.0";
+const RUST_VERSION_THAT_USES_V4_CARGO_LOCKS: Version = Version::new(1, 83, 0);
 
 /// Cargo dependency for `spirv-builder` and the rust toolchain channel.
 #[derive(Debug, Clone)]
@@ -58,12 +60,8 @@ impl LockfileMismatchHandler {
         is_force_overwrite_lockfiles_v4_to_v3: bool,
     ) -> anyhow::Result<Option<std::path::PathBuf>> {
         log::debug!("Ensuring no v3/v4 `Cargo.lock` conflicts from workspace Rust...");
-        let workspace_rust_version =
-            Self::get_rustc_version(None).context("reading rustc version")?;
-        if version_check::Version::at_least(
-            &workspace_rust_version,
-            RUST_VERSION_THAT_USES_V4_CARGO_LOCKS,
-        ) {
+        let workspace_rust_version = query_rustc_version(None).context("reading rustc version")?;
+        if workspace_rust_version >= RUST_VERSION_THAT_USES_V4_CARGO_LOCKS {
             log::debug!(
                 "user's Rust is v{workspace_rust_version}, so no v3/v4 conflicts possible."
             );
@@ -91,11 +89,8 @@ impl LockfileMismatchHandler {
     ) -> anyhow::Result<Option<std::path::PathBuf>> {
         log::debug!("Ensuring no v3/v4 `Cargo.lock` conflicts from shader's Rust...");
         let shader_rust_version =
-            Self::get_rustc_version(Some(channel)).context("getting rustc version")?;
-        if version_check::Version::at_least(
-            &shader_rust_version,
-            RUST_VERSION_THAT_USES_V4_CARGO_LOCKS,
-        ) {
+            query_rustc_version(Some(channel)).context("getting rustc version")?;
+        if shader_rust_version >= RUST_VERSION_THAT_USES_V4_CARGO_LOCKS {
             log::debug!("shader's Rust is v{shader_rust_version}, so no v3/v4 conflicts possible.");
             return Ok(None);
         }
@@ -266,25 +261,6 @@ impl LockfileMismatchHandler {
         );
         std::process::exit(1);
     }
-
-    /// Get the version of `rustc`.
-    fn get_rustc_version(maybe_toolchain: Option<&str>) -> anyhow::Result<version_check::Version> {
-        let mut maybe_current_env_toolchain: Option<std::ffi::OsString> = None;
-        if let Some(toolchain) = maybe_toolchain {
-            maybe_current_env_toolchain = std::env::var_os("RUSTUP_TOOLCHAIN");
-            std::env::set_var("RUSTUP_TOOLCHAIN", toolchain);
-        }
-
-        let Some(version) = version_check::Version::read() else {
-            anyhow::bail!("Couldn't get `rustc --version`");
-        };
-
-        if let Some(current_env_toolchain) = maybe_current_env_toolchain {
-            std::env::set_var("RUSTUP_TOOLCHAIN", current_env_toolchain);
-        }
-
-        Ok(version)
-    }
 }
 
 impl Drop for LockfileMismatchHandler {