Merge pull request #1456 from andyleejordan/ignore-msrustup

Fix local use of `msrustup`

Author: andyleejordan

.gitignore

@@ -1,4 +1,4 @@
-msrustup
+msrustup*
 build/
 target/
 bin/

build.ps1

@@ -190,12 +190,6 @@ process {
             Update-Rust @VerboseParam
         }
 
-        if (!$usingADO) {
-            Write-BuildProgress @progressParams -Status 'Setting RustUp to default channel'
-            $rustup, $channel = Get-RustUp @VerboseParam
-            & $rustup default stable
-        }
-
         if ($Clippy) {
             Write-BuildProgress @progressParams -Status 'Ensuring Clippy is available and updated'
             Install-Clippy -UseCFS:$UseCFS -Architecture $Architecture @VerboseParam

helpers.build.psm1

@@ -435,6 +435,8 @@ function Update-Rust {
 
         Write-Verbose -Verbose "Rust found, updating..."
         $rustup, $channel = Get-RustUp
+        & $rustup toolchain install $channel
+        & $rustup default $channel
         & $rustup update
     }
 }
@@ -581,17 +583,27 @@ function Install-Clippy {
         $Architecture = 'current'
     )
 
+    begin {
+    }
+
     process {
         Write-Verbose -Verbose "Installing clippy..."
         if ($UseCFS) {
             cargo install clippy --config .cargo/config.toml
         } else {
+            $rustup, $channel = Get-RustUp
+
+            if ($rustup -eq 'msrustup') {
+                Write-Verbose -Verbose "Clippy is already included with msrustup"
+                return
+            }
+
             if ($Architecture -ne 'current') {
                 write-verbose -verbose "Installing clippy for $Architecture"
-                rustup component add clippy --target $Architecture
+                & $rustup component add clippy --target $Architecture
             } else {
                 write-verbose -verbose "Installing clippy for current architecture"
-                rustup component add clippy
+                & $rustup component add clippy
             }
         }
         if ($LASTEXITCODE -ne 0) {
@@ -793,24 +805,6 @@ function Install-PowerShellTestPrerequisite {
 #endregion Install tools functions
 
 #region    Environment setup utility functions
-function Set-RustChannel {
-    <#
-        .SYNOPSIS
-        Sets the rust default toolchain to the stable channel.
-    #>
-
-    [CmdletBinding()]
-    param()
-
-    begin {
-        $rustup, $channel = Get-RustUp
-    }
-
-    process {
-        & $rustup default stable
-    }
-}
-
 function Set-CargoEnvironment {
     <#
         .SYNOPSIS

lib/dsc-lib/src/types/date_version.rs

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// TODO: Remove when updating to rustc 1.94; false positive from thiserror + rust-i18n t!() macro
+#![allow(unused_assignments)]
+
 use std::{
     fmt::Display,
     str::FromStr,

lib/dsc-lib/src/types/fully_qualified_type_name.rs

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// TODO: Remove when updating to rustc 1.94; false positive from thiserror + rust-i18n t!() macro
+#![allow(unused_assignments)]
+
 use std::fmt::{Display, Formatter};
 use std::hash::Hash;
 use std::ops::Deref;
@@ -223,7 +226,7 @@ pub enum FullyQualifiedTypeNameError {
     ///
     /// If the fully qualified type name contains any empty namespace segments, validation raises
     /// this error in the `errors` field of the main [`InvalidTypeName`] error.
-    /// 
+    ///
     /// [`InvalidTypeName`]: Self::InvalidTypeName
     #[error("{t}", t = t!(
         "types.fully_qualified_type_name.emptyNamespaceSegment",
@@ -384,7 +387,7 @@ impl FullyQualifiedTypeName {
     ///      }
     ///   );
     ///   ```
-    /// 
+    ///
     /// - An empty namespace segment is not valid.
     ///
     ///   ```rust
@@ -437,21 +440,21 @@ impl FullyQualifiedTypeName {
 
     /// Private helper to parse the input into segments and collect validation errors for owner
     /// and namespace segments.
-    /// 
+    ///
     /// This is used by the public `parse()` method to handle the common parsing and validation
     /// logic that is shared by [`FullyQualifiedTypeName`] and [`WildcardTypeName`] since they
     /// share the same overall structure.
-    /// 
+    ///
     /// # Arguments
-    /// 
+    ///
     /// - `text`: The input string to parse into type name segments.
     /// - `validating_segment_regex`: The regex to use for validating each segment of the type name.
     /// - `errors`: A mutable reference to a vector for collecting any validation errors encountered
     ///   while parsing the segments. This allows the method to accumulate multiple errors for
     ///   different segments of the type name.
-    /// 
+    ///
     /// # Returns
-    /// 
+    ///
     /// The method returns the parsed segments (`owner`, `namespaces`, and `name`) as a tuple. Any
     /// validation errors encountered during parsing are added to the provided `errors` vector for
     /// the caller to handle.
@@ -535,7 +538,7 @@ impl FullyQualifiedTypeName {
     /// number of `namespace` segments, which must be separated from the previous segment by a
     /// single period (`.`). Finally, the string must include a forward slash (`/`) followed by one
     /// or more unicode alphanumeric characters and underscores to define the `name` segment.
-    /// 
+    ///
     /// [`VALIDATING_SEGMENT_PATTERN`]: Self::VALIDATING_SEGMENT_PATTERN
     pub const VALIDATING_PATTERN: &str = r"^\w+(\.\w+)*\/\w+$";
 

lib/dsc-lib/src/types/semantic_version_req.rs

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// TODO: Remove when updating to rustc 1.94; false positive from thiserror + rust-i18n t!() macro
+#![allow(unused_assignments)]
+
 use std::{fmt::Display, ops::Deref, str::FromStr, sync::OnceLock};
 
 use miette::Diagnostic;
@@ -688,28 +691,28 @@ impl SemanticVersionReq {
     /// // 2.0.0 isn't compatible with the requirement.
     /// assert!(!requirement.matches(&SemanticVersion::new(2, 0, 0)));
     /// ```
-    /// 
+    ///
     /// The following example shows how the `matches` function treats prerelease versions as not
     /// matching a requirement unless the requirement explicitly defines a prerelease segment.
-    /// 
+    ///
     /// ```rust
     /// # use dsc_lib::types::{SemanticVersion, SemanticVersionReq};
     /// let v_stable = &SemanticVersion::parse("1.2.3").unwrap();
     /// let v_rc1 = &SemanticVersion::parse("1.2.3-rc.1").unwrap();
     /// let v_rc2 = &SemanticVersion::parse("1.2.3-rc.2").unwrap();
-    /// 
-    /// // Only the stable version matches the stable requirement 
+    ///
+    /// // Only the stable version matches the stable requirement
     /// let stable_req = SemanticVersionReq::parse("^1.2.3").unwrap();
     /// assert!(!stable_req.matches(v_rc1));
     /// assert!(!stable_req.matches(v_rc2));
     /// assert!(stable_req.matches(v_stable));
-    /// 
+    ///
     /// // All three versions match the requirement that explicitly defines the prerelease segment
     /// let prerelease_req = SemanticVersionReq::parse("^1.2.3-rc.1").unwrap();
     /// assert!(prerelease_req.matches(v_stable));
     /// assert!(prerelease_req.matches(v_rc1));
     /// assert!(prerelease_req.matches(v_rc2));
-    /// 
+    ///
     /// ```
     pub fn matches(&self, version: &SemanticVersion) -> bool {
         self.0.matches(version.as_ref())