style(test): access uuid field directly

Author: baka-gourd

src/cli/self_update/windows.rs

@@ -797,7 +797,7 @@ fn random_uuid() -> String {
 /// Guards a set of registry values for the duration of a test.
 #[cfg(any(test, feature = "test"))]
 pub struct RegistryGuard {
-    uuid: String,
+    pub uuid: String,
     saved: Vec<(&'static RegistryValueId, Option<Value>)>,
 }
 
@@ -814,10 +814,6 @@ impl RegistryGuard {
         }
         Ok(Self { uuid, saved })
     }
-
-    pub fn uuid(&self) -> &str {
-        &self.uuid
-    }
 }
 
 #[cfg(any(test, feature = "test"))]
@@ -893,7 +889,7 @@ mod tests {
             ("HOME".to_string(), "/unused".to_string()),
             (
                 RUSTUP_TEST_REGISTRY_UUID.to_string(),
-                guard.uuid().to_string(),
+                guard.uuid.to_string(),
             ),
         ]
         .into_iter()
@@ -903,7 +899,7 @@ mod tests {
 
     fn test_environment_key(guard: &RegistryGuard) -> Key {
         CURRENT_USER
-            .create(map_sub_key("Environment", guard.uuid()))
+            .create(map_sub_key("Environment", guard.uuid.as_str()))
             .unwrap()
     }
 

src/test/clitools.rs

@@ -1000,7 +1000,7 @@ impl CliTestContext {
         ids: impl IntoIterator<Item = &'static crate::cli::self_update::RegistryValueId>,
     ) {
         let guard = crate::cli::self_update::RegistryGuard::new(ids).unwrap();
-        self.config.set_registry_uuid(guard.uuid());
+        self.config.set_registry_uuid(&guard.uuid);
         self._registry_guard = Some(guard);
     }
 

tests/suite/cli_paths.rs

@@ -483,8 +483,8 @@ mod windows {
     async fn install_uninstall_affect_path() {
         let mut cx = CliTestContext::new(Scenario::Empty).await;
         let guard = RegistryGuard::new([&USER_PATH]).unwrap();
-        cx.config.set_registry_uuid(guard.uuid());
-        let uuid = guard.uuid().to_string();
+        cx.config.set_registry_uuid(&guard.uuid);
+        let uuid = guard.uuid.to_string();
         let cfg_path = cx.config.cargodir.join("bin").display().to_string();
         let read_path = |uuid: &str| -> Option<String> {
             retry(
@@ -516,8 +516,8 @@ mod windows {
     async fn uninstall_keeps_path_when_cargo_bin_is_non_empty() {
         let mut cx = CliTestContext::new(Scenario::Empty).await;
         let guard = RegistryGuard::new([&USER_PATH]).unwrap();
-        cx.config.set_registry_uuid(guard.uuid());
-        let uuid = guard.uuid().to_string();
+        cx.config.set_registry_uuid(&guard.uuid);
+        let uuid = guard.uuid.to_string();
         let cfg_path = cx.config.cargodir.join("bin").display().to_string();
         let get_path_ = || {
             HSTRING::try_from(get_path(Some(&uuid)).unwrap().unwrap())
@@ -543,8 +543,8 @@ mod windows {
     async fn uninstall_doesnt_affect_path_with_no_modify_path() {
         let mut cx = CliTestContext::new(Scenario::Empty).await;
         let guard = RegistryGuard::new([&USER_PATH]).unwrap();
-        cx.config.set_registry_uuid(guard.uuid());
-        let uuid = guard.uuid().to_string();
+        cx.config.set_registry_uuid(&guard.uuid);
+        let uuid = guard.uuid.to_string();
         let cfg_path = cx.config.cargodir.join("bin").display().to_string();
         let get_path_ = || {
             HSTRING::try_from(get_path(Some(&uuid)).unwrap().unwrap())
@@ -574,8 +574,8 @@ mod windows {
 
         let mut cx = CliTestContext::new(Scenario::Empty).await;
         let guard = RegistryGuard::new([&USER_PATH]).unwrap();
-        cx.config.set_registry_uuid(guard.uuid());
-        let uuid = guard.uuid().to_string();
+        cx.config.set_registry_uuid(&guard.uuid);
+        let uuid = guard.uuid.to_string();
         // Set up a non unicode PATH
         let mut reg_value = Value::from([
             0x00, 0xD8, // leading surrogate

tests/suite/cli_self_upd.rs

@@ -483,19 +483,19 @@ async fn update_overwrites_programs_display_version() {
 
     let mut cx = SelfUpdateTestContext::new(TEST_VERSION).await;
     let guard = RegistryGuard::new([&USER_PATH, &USER_RUSTUP_VERSION]).unwrap();
-    cx.config.set_registry_uuid(guard.uuid());
+    cx.config.set_registry_uuid(&guard.uuid);
     cx.config
         .expect(["rustup-init", "-y", "--no-modify-path"])
         .await
         .is_ok();
 
     USER_RUSTUP_VERSION
-        .set(Some(&Value::from(PLACEHOLDER_VERSION)), Some(guard.uuid()))
+        .set(Some(&Value::from(PLACEHOLDER_VERSION)), Some(&guard.uuid))
         .unwrap();
     cx.config.expect(["rustup", "self", "update"]).await.is_ok();
     assert_eq!(
         USER_RUSTUP_VERSION
-            .get(Some(guard.uuid()))
+            .get(Some(&guard.uuid))
             .unwrap()
             .unwrap(),
         Value::from(version)