Merge branch 'remove-googletest'

3 files changed, 4 insertions, 6 deletions

diff --git a/.gitmodules b/.gitmodules
index 3e95167fce..e8c3ba4187 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule "windows/windows-libraries"]
 	path = windows/windows-libraries
 	url = https://github.com/mullvad/windows-libraries
-[submodule "windows/googletest"]
-	path = windows/googletest
-	url = https://github.com/mullvad/googletest
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs
index 4e4486f1c4..444d6e8304 100644
--- a/mullvad-daemon/src/system_service.rs
+++ b/mullvad-daemon/src/system_service.rs
@@ -462,13 +462,14 @@ impl HibernationDetector {
         // Returned count is including null terminator.
         let chars_required = GetSystemDirectoryW(ptr::null_mut(), 0);
         if chars_required != 0 {
-            let mut buffer: Vec::<WCHAR> = Vec::with_capacity(chars_required as usize);
+            let mut buffer: Vec<WCHAR> = Vec::with_capacity(chars_required as usize);
             // Returned count is excluding null terminator.
             let chars_written = GetSystemDirectoryW(buffer.as_mut_ptr(), chars_required);
             if chars_written == (chars_required - 1) {
                 buffer.set_len(chars_written as usize);
-                let mut path = String::from_utf16(&buffer)
-                    .map_err(|e| e.display_chain_with_msg("Failed to convert system directory path string"))?;
+                let mut path = String::from_utf16(&buffer).map_err(|e| {
+                    e.display_chain_with_msg("Failed to convert system directory path string")
+                })?;
                 if !path.ends_with("\\") {
                     path.push('\\');
                 }
diff --git a/windows/googletest b/windows/googletest
deleted file mode 160000
-Subproject b06fea29a02252dff4374e505c56e6db6e82639