chore: update rust and the cargo edition (#135)

ruben-arts · web-flow · commit fbfd81dc82ef · 2025-05-02T15:55:54.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 
 [workspace.dependencies]
 async-trait = "0.1.86"
@@ -36,7 +36,7 @@ jsonrpc-stdio-server = "18.0.0"
 jsonrpc-http-server = "18.0.0"
 jsonrpc-core = "18.0.0"
 
-rattler-build = { version = "0.39.0", default-features = false, features = [
+rattler-build = { version = "*", default-features = false, features = [
   "rustls-tls",
 ] }
 
diff --git a/crates/pixi-build-backend/src/cache.rs b/crates/pixi-build-backend/src/cache.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::{traits::Dependencies, ProjectModel, Targets};
+use crate::{ProjectModel, Targets, traits::Dependencies};
 
 pub fn sccache_tools() -> Vec<String> {
     vec!["sccache".to_string()]
diff --git a/crates/pixi-build-backend/src/cli.rs b/crates/pixi-build-backend/src/cli.rs
@@ -4,15 +4,15 @@ use clap::{Parser, Subcommand};
 use clap_verbosity_flag::{InfoLevel, Verbosity};
 use miette::{Context, IntoDiagnostic};
 use pixi_build_types::{
+    BackendCapabilities, ChannelConfiguration, FrontendCapabilities, PlatformAndVirtualPackages,
     procedures::{
         conda_build::CondaBuildParams,
         conda_metadata::{CondaMetadataParams, CondaMetadataResult},
         initialize::InitializeParams,
         negotiate_capabilities::NegotiateCapabilitiesParams,
     },
-    BackendCapabilities, ChannelConfiguration, FrontendCapabilities, PlatformAndVirtualPackages,
 };
-use rattler_build::console_utils::{get_default_env_filter, LoggingOutputHandler};
+use rattler_build::console_utils::{LoggingOutputHandler, get_default_env_filter};
 use rattler_conda_types::{ChannelConfig, GenericVirtualPackage, Platform};
 use rattler_virtual_packages::{VirtualPackage, VirtualPackageOverrides};
 use tempfile::TempDir;
@@ -157,7 +157,7 @@ async fn initialize<T: ProtocolInstantiator>(
     let (protocol, _initialize_result) = factory
         .initialize(InitializeParams {
             manifest_path: manifest_path.to_path_buf(),
-            project_model: project_model.map(Into::into),
+            project_model,
             cache_directory: None,
             configuration: None,
         })
diff --git a/crates/pixi-build-backend/src/common/configuration.rs b/crates/pixi-build-backend/src/common/configuration.rs
@@ -3,9 +3,9 @@ use std::collections::BTreeMap;
 use miette::IntoDiagnostic;
 use pixi_build_types::PlatformAndVirtualPackages;
 use rattler_build::{
+    NormalizedKey,
     metadata::{Directories, PlatformWithVirtualPackages},
     recipe::variable::Variable,
-    NormalizedKey,
 };
 use rattler_conda_types::ChannelUrl;
 use rattler_virtual_packages::VirtualPackageOverrides;
diff --git a/crates/pixi-build-backend/src/common/mod.rs b/crates/pixi-build-backend/src/common/mod.rs
@@ -3,6 +3,6 @@ mod configuration;
 mod requirements;
 mod variants;
 
-pub use configuration::{build_configuration, BuildConfigurationParams};
-pub use requirements::{requirements, PackageRequirements, SourceRequirements};
+pub use configuration::{BuildConfigurationParams, build_configuration};
+pub use requirements::{PackageRequirements, SourceRequirements, requirements};
 pub use variants::compute_variants;
diff --git a/crates/pixi-build-backend/src/common/requirements.rs b/crates/pixi-build-backend/src/common/requirements.rs
@@ -1,13 +1,13 @@
 use std::collections::{BTreeMap, HashMap};
 
 use rattler_build::{
-    recipe::{parser::Requirements, variable::Variable},
     NormalizedKey,
+    recipe::{parser::Requirements, variable::Variable},
 };
 use serde::Serialize;
 
 use crate::{
-    dependencies::ExtractedDependencies, traits::Dependencies, PackageSpec, ProjectModel, Targets,
+    PackageSpec, ProjectModel, Targets, dependencies::ExtractedDependencies, traits::Dependencies,
 };
 
 pub struct PackageRequirements<P: ProjectModel> {
diff --git a/crates/pixi-build-backend/src/common/variants.rs b/crates/pixi-build-backend/src/common/variants.rs
@@ -3,7 +3,7 @@
 use std::collections::BTreeMap;
 
 use miette::IntoDiagnostic;
-use rattler_build::{recipe::variable::Variable, variant_config::VariantConfig, NormalizedKey};
+use rattler_build::{NormalizedKey, recipe::variable::Variable, variant_config::VariantConfig};
 use rattler_conda_types::Platform;
 
 use crate::ProjectModel;
diff --git a/crates/pixi-build-backend/src/dependencies.rs b/crates/pixi-build-backend/src/dependencies.rs
@@ -6,8 +6,8 @@ use std::{
 use miette::{Context, IntoDiagnostic};
 use pixi_build_types as pbt;
 use rattler_build::{
-    recipe::{parser::Dependency, variable::Variable},
     NormalizedKey,
+    recipe::{parser::Dependency, variable::Variable},
 };
 use rattler_conda_types::{MatchSpec, NamelessMatchSpec, PackageName, ParseStrictness::Strict};
 
diff --git a/crates/pixi-build-backend/src/server.rs b/crates/pixi-build-backend/src/server.rs
@@ -1,6 +1,6 @@
 use std::{net::SocketAddr, sync::Arc};
 
-use jsonrpc_core::{serde_json, to_value, Error, IoHandler, Params};
+use jsonrpc_core::{Error, IoHandler, Params, serde_json, to_value};
 use miette::{IntoDiagnostic, JSONReportHandler};
 use pixi_build_types::procedures::{
     self, conda_build::CondaBuildParams, conda_metadata::CondaMetadataParams,
diff --git a/crates/pixi-build-backend/src/tools.rs b/crates/pixi-build-backend/src/tools.rs
@@ -8,22 +8,23 @@ use indexmap::IndexSet;
 use itertools::Itertools;
 use miette::IntoDiagnostic;
 use pixi_build_types::procedures::conda_metadata::CondaMetadataParams;
+use rattler_build::metadata::Debug;
 use rattler_build::{
     hash::HashInfo,
     metadata::{
         BuildConfiguration, Directories, Output, PackageIdentifier, PackagingSettings,
         PlatformWithVirtualPackages,
     },
     recipe::{
-        parser::{find_outputs_from_src, GlobVec},
-        variable::Variable,
         Jinja, ParsingError, Recipe,
+        parser::{GlobVec, find_outputs_from_src},
+        variable::Variable,
     },
     selectors::SelectorConfig,
     system_tools::SystemTools,
     variant_config::{DiscoveredOutput, ParseErrors, VariantConfig},
 };
-use rattler_conda_types::{package::ArchiveType, GenericVirtualPackage, Platform};
+use rattler_conda_types::{GenericVirtualPackage, Platform, package::ArchiveType};
 use rattler_package_streaming::write::CompressionLevel;
 use rattler_virtual_packages::VirtualPackageOverrides;
 use url::Url;
@@ -198,7 +199,7 @@ impl RattlerBuild {
                 recipe.package().name().clone(),
                 PackageIdentifier {
                     name: recipe.package().name().clone(),
-                    version: recipe.package().version().version().clone(),
+                    version: recipe.package().version().version().clone().into(),
                     build_string: recipe
                         .build()
                         .string()
@@ -243,6 +244,7 @@ impl RattlerBuild {
                     store_recipe: false,
                     force_colors: true,
                     sandbox_config: None,
+                    debug: Debug::new(false),
                 },
                 finalized_dependencies: None,
                 finalized_cache_dependencies: None,
diff --git a/crates/pixi-build-backend/src/traits/project.rs b/crates/pixi-build-backend/src/traits/project.rs
@@ -11,7 +11,7 @@ use pixi_build_types::{self as pbt};
 use rattler_build::NormalizedKey;
 use rattler_conda_types::{Platform, Version};
 
-use super::{targets::Targets, Dependencies, PackageSpec};
+use super::{Dependencies, PackageSpec, targets::Targets};
 
 /// A trait that defines the project model interface
 pub trait ProjectModel {
diff --git a/crates/pixi-build-cmake/src/cmake.rs b/crates/pixi-build-cmake/src/cmake.rs
@@ -10,25 +10,26 @@ use crate::{
 };
 use miette::IntoDiagnostic;
 use pixi_build_backend::common::{PackageRequirements, SourceRequirements};
+use pixi_build_backend::{ProjectModel, Targets};
 use pixi_build_backend::{
-    common::{requirements, BuildConfigurationParams},
+    common::{BuildConfigurationParams, requirements},
     compilers::default_compiler,
-    traits::{project::new_spec, Dependencies},
+    traits::{Dependencies, project::new_spec},
 };
-use pixi_build_backend::{ProjectModel, Targets};
+use rattler_build::metadata::Debug;
 use rattler_build::recipe::parser::{BuildString, ScriptContent};
 use rattler_build::{
+    NormalizedKey,
     console_utils::LoggingOutputHandler,
     hash::HashInfo,
     metadata::{BuildConfiguration, PackagingSettings},
     recipe::{
+        Recipe,
         parser::{Build, Dependency, Package, Script},
         variable::Variable,
-        Recipe,
     },
-    NormalizedKey,
 };
-use rattler_conda_types::{package::ArchiveType, MatchSpec, NoArchType, PackageName, Platform};
+use rattler_conda_types::{MatchSpec, NoArchType, PackageName, Platform, package::ArchiveType};
 use rattler_package_streaming::write::CompressionLevel;
 
 pub struct CMakeBuildBackend<P: ProjectModel> {
@@ -253,6 +254,7 @@ pub(crate) fn construct_configuration(
         store_recipe: false,
         force_colors: true,
         sandbox_config: None,
+        debug: Debug::new(false),
     }
 }
 
diff --git a/crates/pixi-build-cmake/src/protocol.rs b/crates/pixi-build-cmake/src/protocol.rs
@@ -2,12 +2,13 @@ use std::{str::FromStr, sync::Arc};
 
 use miette::{Context, IntoDiagnostic};
 use pixi_build_backend::{
+    PackageSourceSpec,
     common::{build_configuration, compute_variants},
     protocol::{Protocol, ProtocolInstantiator},
     utils::TemporaryRenderedRecipe,
-    PackageSourceSpec,
 };
 use pixi_build_types::{
+    BackendCapabilities, CondaPackageMetadata, PlatformAndVirtualPackages, ProjectModelV1,
     procedures::{
         conda_build::{
             CondaBuildParams, CondaBuildResult, CondaBuiltPackage, CondaOutputIdentifier,
@@ -16,21 +17,20 @@ use pixi_build_types::{
         initialize::{InitializeParams, InitializeResult},
         negotiate_capabilities::{NegotiateCapabilitiesParams, NegotiateCapabilitiesResult},
     },
-    BackendCapabilities, CondaPackageMetadata, PlatformAndVirtualPackages, ProjectModelV1,
 };
 use rattler_build::{
     build::run_build,
     console_utils::LoggingOutputHandler,
     hash::HashInfo,
     metadata::{Directories, Output},
-    recipe::{parser::BuildString, variable::Variable, Jinja},
+    recipe::{Jinja, parser::BuildString, variable::Variable},
     render::resolved_dependencies::DependencyInfo,
     tool_configuration::Configuration,
 };
 use rattler_conda_types::{ChannelConfig, MatchSpec, PackageName, Platform};
 
 use crate::{
-    cmake::{construct_configuration, CMakeBuildBackend},
+    cmake::{CMakeBuildBackend, construct_configuration},
     config::CMakeBackendConfig,
 };
 
@@ -173,7 +173,7 @@ impl Protocol for CMakeBuildBackend<ProjectModelV1> {
 
             packages.push(CondaPackageMetadata {
                 name: output.name().clone(),
-                version: output.version().clone().into(),
+                version: output.version().clone(),
                 build: build_string.to_string(),
                 build_number: output.recipe.build.number,
                 subdir: output.build_configuration.target_platform,
@@ -323,16 +323,16 @@ impl Protocol for CMakeBuildBackend<ProjectModelV1> {
                             subdir,
                         } = &iden;
                         name.as_ref()
-                            .map_or(true, |n| output.name().as_normalized() == n)
+                            .is_none_or(|n| output.name().as_normalized() == n)
                             && version
                                 .as_ref()
-                                .map_or(true, |v| output.version().to_string() == *v)
+                                .is_none_or(|v| output.version().to_string() == *v)
                             && build
                                 .as_ref()
-                                .map_or(true, |b| output.build_string() == b.as_str())
+                                .is_none_or(|b| output.build_string() == b.as_str())
                             && subdir
                                 .as_ref()
-                                .map_or(true, |s| output.target_platform().as_str() == s)
+                                .is_none_or(|s| output.target_platform().as_str() == s)
                     })?;
                     Some(outputs.remove(pos))
                 })
diff --git a/crates/pixi-build-python/src/build_script.rs b/crates/pixi-build-python/src/build_script.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use minijinja::Environment;
-use pixi_build_backend::{traits::Dependencies, ProjectModel, Targets};
+use pixi_build_backend::{ProjectModel, Targets, traits::Dependencies};
 use serde::Serialize;
 
 const UV: &str = "uv";
diff --git a/crates/pixi-build-python/src/config.rs b/crates/pixi-build-python/src/config.rs
@@ -18,7 +18,7 @@ pub struct PythonBackendConfig {
 impl PythonBackendConfig {
     /// Whether to build a noarch package or a platform-specific package.
     pub fn noarch(&self) -> bool {
-        self.noarch.map_or(true, identity)
+        self.noarch.is_none_or(identity)
     }
 }
 
diff --git a/crates/pixi-build-python/src/protocol.rs b/crates/pixi-build-python/src/protocol.rs
@@ -2,12 +2,13 @@ use std::{str::FromStr, sync::Arc};
 
 use miette::{Context, IntoDiagnostic};
 use pixi_build_backend::{
+    PackageSourceSpec, ProjectModel,
     common::{build_configuration, compute_variants},
     protocol::{Protocol, ProtocolInstantiator},
     utils::TemporaryRenderedRecipe,
-    PackageSourceSpec, ProjectModel,
 };
 use pixi_build_types::{
+    BackendCapabilities, CondaPackageMetadata, PlatformAndVirtualPackages,
     procedures::{
         conda_build::{
             CondaBuildParams, CondaBuildResult, CondaBuiltPackage, CondaOutputIdentifier,
@@ -16,15 +17,14 @@ use pixi_build_types::{
         initialize::{InitializeParams, InitializeResult},
         negotiate_capabilities::{NegotiateCapabilitiesParams, NegotiateCapabilitiesResult},
     },
-    BackendCapabilities, CondaPackageMetadata, PlatformAndVirtualPackages,
 };
 // use pixi_build_types as pbt;
 use rattler_build::{
     build::run_build,
     console_utils::LoggingOutputHandler,
     hash::HashInfo,
     metadata::{Directories, Output},
-    recipe::{parser::BuildString, variable::Variable, Jinja},
+    recipe::{Jinja, parser::BuildString, variable::Variable},
     render::resolved_dependencies::DependencyInfo,
     tool_configuration::Configuration,
     variant_config::VariantConfig,
@@ -33,7 +33,7 @@ use rattler_conda_types::{ChannelConfig, MatchSpec, PackageName, Platform};
 
 use crate::{
     config::PythonBackendConfig,
-    python::{construct_configuration, PythonBuildBackend},
+    python::{PythonBuildBackend, construct_configuration},
 };
 
 #[async_trait::async_trait]
@@ -164,7 +164,7 @@ impl<P: ProjectModel + Sync> Protocol for PythonBuildBackend<P> {
 
             packages.push(CondaPackageMetadata {
                 name: output.name().clone(),
-                version: output.version().clone().into(),
+                version: output.version().clone(),
                 build: build_string.to_string(),
                 build_number: output.recipe.build.number,
                 subdir: output.build_configuration.target_platform,
@@ -315,16 +315,16 @@ impl<P: ProjectModel + Sync> Protocol for PythonBuildBackend<P> {
                             subdir,
                         } = &iden;
                         name.as_ref()
-                            .map_or(true, |n| output.name().as_normalized() == n)
+                            .is_none_or(|n| output.name().as_normalized() == n)
                             && version
                                 .as_ref()
-                                .map_or(true, |v| output.version().to_string() == *v)
+                                .is_none_or(|v| output.version().to_string() == *v)
                             && build
                                 .as_ref()
-                                .map_or(true, |b| output.build_string() == b.as_str())
+                                .is_none_or(|b| output.build_string() == b.as_str())
                             && subdir
                                 .as_ref()
-                                .map_or(true, |s| output.target_platform().as_str() == s)
+                                .is_none_or(|s| output.target_platform().as_str() == s)
                     })?;
                     Some(outputs.remove(pos))
                 })
diff --git a/crates/pixi-build-python/src/python.rs b/crates/pixi-build-python/src/python.rs
diff --git a/crates/pixi-build-rattler-build/src/protocol.rs b/crates/pixi-build-rattler-build/src/protocol.rs
diff --git a/crates/pixi-build-rust/src/protocol.rs b/crates/pixi-build-rust/src/protocol.rs
diff --git a/crates/pixi-build-rust/src/rust.rs b/crates/pixi-build-rust/src/rust.rs
diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
diff --git a/rust-toolchain b/rust-toolchain

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pub struct PythonBackendConfig {`
`18`	`18`	`impl PythonBackendConfig {`
`19`	`19`	`/// Whether to build a noarch package or a platform-specific package.`
`20`	`20`	`pub fn noarch(&self) -> bool {`
`21`		`- self.noarch.map_or(true, identity)`
	`21`	`+ self.noarch.is_none_or(identity)`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`