Merge branch 'alexpovel:main' into rename-lang-to-compiled-query

.github/workflows/main.yml

@@ -196,6 +196,11 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    # Only run this on push events: `pull_request` events will not have access to
+    # secrets if coming from forks, and we do not care about release chores there
+    # anyway.
+    if: github.event_name == 'push'
+
     outputs:
       created: ${{ steps.release.outputs.release_created }}
       tag_name: ${{ steps.release.outputs.tag_name }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "0.13.2"
+    ".": "0.13.3"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.13.3](https://github.com/alexpovel/srgn/compare/srgn-v0.13.2...srgn-v0.13.3) (2024-10-19)
+
+
+### Bug Fixes
+
+* **files:** Writing new files works across devices ([1b27825](https://github.com/alexpovel/srgn/commit/1b278251f3aaa273b221f9520512a55ab04bd6cc)), closes [#145](https://github.com/alexpovel/srgn/issues/145)
+
 ## [0.13.2](https://github.com/alexpovel/srgn/compare/srgn-v0.13.1...srgn-v0.13.2) (2024-09-27)
 
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "srgn"
-version = "0.13.2"
+version = "0.13.3"
 edition = "2021"
 authors = ["Alex Povel <[email protected]>"]
 description = "A grep-like tool which understands source code syntax and allows for manipulation in addition to search"

release-please-config.json

@@ -3,7 +3,6 @@
     "packages": {
         ".": {}
     },
-    "bootstrap-sha": "22c06f621585a3f872e1677c3b5d1238efec05dc",
     "release-type": "rust",
     "bump-minor-pre-major": true,
     "bump-patch-for-minor-pre-major": true,

src/main.rs

@@ -4,7 +4,7 @@
 //! deals with CLI argument handling, I/O, threading, and more.
 
 use std::error::Error;
-use std::fs::File;
+use std::fs::{self, File};
 use std::io::{self, stdout, Read, Write};
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
@@ -609,17 +609,11 @@ fn process_path(
         }
 
         if changed {
-            writeln!(stdout, "{}", path.display())?;
-
             debug!("Got new file contents, writing to file: {:?}", path);
-            let mut file = tempfile::Builder::new()
-                .prefix(env!("CARGO_PKG_NAME"))
-                .tempfile()?;
-            trace!("Writing to temporary file: {:?}", file.path());
-            file.write_all(new_contents.as_bytes())?;
-
-            // Atomically replace so SIGINT etc. do not leave dangling crap.
-            file.persist(&path)?;
+            fs::write(&path, new_contents.as_bytes())?;
+
+            // Confirm after successful write.
+            writeln!(stdout, "{}", path.display())?;
         } else {
             debug!(
                 "Skipping writing file anew (nothing changed): {}",
@@ -845,12 +839,6 @@ impl From<ApplicationError> for PathProcessingError {
     }
 }
 
-impl From<tempfile::PersistError> for PathProcessingError {
-    fn from(err: tempfile::PersistError) -> Self {
-        Self::IoError(err.error, Some(err.file.path().to_owned()))
-    }
-}
-
 impl Error for PathProcessingError {}
 
 #[derive(Debug)]