Move FileLock into oak_cache and remove oak_fs (#1321)

More minor follow up from the source PRs, nothing to see here really

Author: DavisVaughan

Cargo.lock

@@ -78,7 +78,6 @@ notify = "8.2.0"
 oak_cache = { path = "crates/oak_cache" }
 oak_core = { path = "crates/oak_core" }
 oak_db = { path = "crates/oak_db" }
-oak_fs = { path = "crates/oak_fs" }
 oak_ide = { path = "crates/oak_ide" }
 oak_index_vec = { path = "crates/oak_index_vec" }
 oak_package_metadata = { path = "crates/oak_package_metadata" }

Cargo.toml

@@ -9,8 +9,11 @@ license.workspace = true
 [dependencies]
 anyhow.workspace = true
 etcetera.workspace = true
+libc.workspace = true
 log.workspace = true
-oak_fs.workspace = true
+
+[target.'cfg(windows)'.dependencies]
+windows-sys = { workspace = true, features = ["Win32_Foundation"] }
 
 [dev-dependencies]
 tempfile.workspace = true

crates/oak_cache/Cargo.toml

@@ -7,12 +7,14 @@
 //! completion-sentinel, last-access, and LRU-eviction machinery all live here so
 //! callers don't reimplement it.
 
+mod file_lock;
+
 use std::path::Path;
 use std::path::PathBuf;
 use std::time::SystemTime;
 
-use oak_fs::file_lock::FileLock;
-use oak_fs::file_lock::Filesystem;
+use crate::file_lock::FileLock;
+use crate::file_lock::Filesystem;
 
 /// Name of the root lock file and the per-key lock file.
 const LOCK_FILENAME: &str = ".lock";

crates/oak_fs/src/file_lock.rs crates/oak_cache/src/file_lock.rscrates/oak_fs/src/file_lock.rs renamed to crates/oak_cache/src/file_lock.rs

@@ -11,7 +11,6 @@ anyhow.workspace = true
 flate2.workspace = true
 log.workspace = true
 oak_cache.workspace = true
-oak_fs.workspace = true
 tar.workspace = true
 ureq.workspace = true
 

crates/oak_cache/src/lib.rs

@@ -45,7 +45,7 @@ pub(crate) fn extract(reader: impl Read, dir: &Path) -> anyhow::Result<()> {
         entry.unpack(&destination)?;
 
         if is_file {
-            oak_fs::permissions::set_readonly(&destination)?;
+            set_readonly(&destination)?;
         }
     }
 
@@ -74,3 +74,10 @@ fn strip_top_level(path: &Path) -> Option<&Path> {
 
     Some(rest)
 }
+
+/// Mark a file as read only
+fn set_readonly(path: &Path) -> std::io::Result<()> {
+    let mut permissions = std::fs::metadata(path)?.permissions();
+    permissions.set_readonly(true);
+    std::fs::set_permissions(path, permissions)
+}