minor: incorporate review feedback

Author: rot256

build.rs

@@ -220,7 +220,7 @@ impl Artifact {
         std::fs::File::open(self.path()?).map_err(Into::into)
     }
 
-    // check if the artifact exists
+    // check if the artifact exists in cache
     fn exists(&self) -> bool {
         self.path().map(|p| p.exists()).unwrap_or(false)
     }
@@ -328,7 +328,7 @@ fn build_resource_tar(arts: &ArtifactStore) -> Result<(), anyhow::Error> {
     let tar = flate2::write::GzEncoder::new(tar_gz, flate2::Compression::default());
     let mut archive = tar::Builder::new(tar);
 
-    // decompress the corelib tarball and add "cario/corelib" as "corelib" to the archive
+    // decompress the corelib tarball and add "cairo/corelib" as "corelib" to the archive
     archive.append_dir_all(
         DIR_CORELIB,
         deflate_artifact(arts.find(RES_CORELIB)?)?

src/resources.rs

@@ -1,10 +1,7 @@
-// This file is generated by build.rs"
+// This file is generated by build.rs
+// and contains the resources embedded in the binary
 include!(concat!(env!("OUT_DIR"), "/resources.rs"));
 
-pub fn resource_id() -> u64 {
-    RESOURCE_ID
-}
-
 pub fn resource_root(uid: u32) -> std::path::PathBuf {
     std::env::temp_dir().join(format!("stone-cli-{}", uid))
 }
@@ -13,6 +10,10 @@ pub fn resource_dir(uid: u32) -> std::path::PathBuf {
     resource_root(uid).join(format!("{:x}", resource_id()))
 }
 
+pub fn resource_id() -> u64 {
+    RESOURCE_ID
+}
+
 pub fn resource_tar() -> &'static [u8] {
     RESOURCE_TAR
 }

src/setup.rs

@@ -22,7 +22,7 @@ const ENV_CONFIGURE: [(&str, &str); 5] = [
 ];
 
 fn copy_resources(uid: u32, mode: u32) -> anyhow::Result<()> {
-    // if the flag file exists, return: setup is already done
+    // if the resource directory already exists, we're done
     if resources::resource_dir(uid).exists() {
         return Ok(());
     }
@@ -98,13 +98,11 @@ pub fn setup() {
     let dir = resources::resource_dir(meta.uid());
     for (env_name, filename) in ENV_CONFIGURE.iter() {
         let full_path = dir.join(filename);
-        debug_assert!(
+        assert!(
             full_path.exists(), //
             "File not found: {:?}",
             full_path
         );
-        if std::env::var(env_name).is_err() {
-            std::env::set_var(env_name, full_path);
-        }
+        std::env::set_var(env_name, full_path);
     }
 }