summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <git@bigly.dog>2022-05-05 21:01:23 +0000
committerroot <git@bigly.dog>2022-05-05 21:01:23 +0000
commitebd5072ec8d74d7722dfed9315ba4747bbc81315 (patch)
tree336acae1d86a862d5ca0431f5abe97d6a0864dfb
parentcf7abef7b9551b20315268017846db6003cae72a (diff)
into
-rw-r--r--src/fs_pipe.rs9
-rw-r--r--src/main.rs4
-rw-r--r--src/udiff.rs10
3 files changed, 13 insertions, 10 deletions
diff --git a/src/fs_pipe.rs b/src/fs_pipe.rs
index 300dd82..6927ae4 100644
--- a/src/fs_pipe.rs
+++ b/src/fs_pipe.rs
@@ -3,7 +3,7 @@ use {
std::{borrow::ToOwned, fs::Metadata, io::ErrorKind, path::Path},
tokio::{
fs::{rename, File, OpenOptions},
- io::{AsyncReadExt, AsyncWriteExt},
+ io::{AsyncReadExt, AsyncWriteExt, BufWriter},
},
uuid::Uuid,
};
@@ -47,7 +47,7 @@ pub async fn spit(canonical: &Path, meta: &Metadata, text: &str) -> Result<(), F
file_name.push(uuid);
let tmp = canonical.with_file_name(file_name);
- let mut fd = OpenOptions::new()
+ let fd = OpenOptions::new()
.create_new(true)
.write(true)
.open(&tmp)
@@ -56,7 +56,10 @@ pub async fn spit(canonical: &Path, meta: &Metadata, text: &str) -> Result<(), F
fd.set_permissions(meta.permissions())
.await
.map_err(|e| Fail::IO(tmp.clone(), e.kind()))?;
- fd.write_all(text.as_bytes())
+
+ let mut writer = BufWriter::new(fd);
+ writer
+ .write_all(text.as_bytes())
.await
.map_err(|e| Fail::IO(tmp.clone(), e.kind()))?;
diff --git a/src/main.rs b/src/main.rs
index 76ca35a..074bce7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,7 +23,7 @@ use {
},
input::{stream_in, Payload},
output::stream_out,
- std::{process::exit, sync::Arc, thread::available_parallelism},
+ std::{convert::Into, process::exit, sync::Arc, thread::available_parallelism},
tokio::{
runtime::Builder,
sync::mpsc::{self, Receiver},
@@ -94,7 +94,7 @@ async fn run(abort: &Arc<Abort>, threads: usize) -> Result<(), Fail> {
}
fn main() {
- let threads = available_parallelism().map(|s| s.into()).unwrap_or(4);
+ let threads = available_parallelism().map(Into::into).unwrap_or(4);
let rt = Builder::new_multi_thread()
.enable_io()
.max_blocking_threads(threads)
diff --git a/src/udiff.rs b/src/udiff.rs
index 12633f2..709ad15 100644
--- a/src/udiff.rs
+++ b/src/udiff.rs
@@ -34,8 +34,8 @@ impl Display for DiffRange {
}
pub fn pure_diffs(unified: usize, before: &str, after: &str) -> Vec<DiffRange> {
- let before = before.split_inclusive("\n").collect::<Vec<_>>();
- let after = after.split_inclusive("\n").collect::<Vec<_>>();
+ let before = before.split_inclusive('\n').collect::<Vec<_>>();
+ let after = after.split_inclusive('\n').collect::<Vec<_>>();
let mut ret = Vec::new();
let mut matcher = SequenceMatcher::new(&before, &after);
for group in &matcher.get_grouped_opcodes(unified) {
@@ -51,8 +51,8 @@ pub struct Patch {
}
pub fn patches(unified: usize, before: &str, after: &str) -> Vec<Patch> {
- let before = before.split_inclusive("\n").collect::<Vec<_>>();
- let after = after.split_inclusive("\n").collect::<Vec<_>>();
+ let before = before.split_inclusive('\n').collect::<Vec<_>>();
+ let after = after.split_inclusive('\n').collect::<Vec<_>>();
let mut ret = Vec::new();
let mut matcher = SequenceMatcher::new(&before, &after);
@@ -82,7 +82,7 @@ pub fn patches(unified: usize, before: &str, after: &str) -> Vec<Patch> {
}
pub fn apply_patches(patches: Vec<Patch>, ranges: &HashSet<DiffRange>, before: &str) -> String {
- let before = before.split_inclusive("\n").collect::<Vec<_>>();
+ let before = before.split_inclusive('\n').collect::<Vec<_>>();
let mut ret = String::new();
let mut prev = 0;