Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Leases rather than GC locks #275

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cargo/mutants.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ examine_globs = [
# # "src/backup.rs",
# "src/bin/conserve.rs",
"src/transport.rs",
# "src/transport/local.rs",
"src/transport/local.rs",
]

exclude_globs = [
Expand Down
18 changes: 18 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@ filetime = "0.2"
futures = { version = "0.3", optional = true }
globset = "0.4.5"
hex = "0.4.2"
hostname = "0.3"
itertools = "0.12"
lazy_static = "1.4.0"
libssh2-sys = { version = "0.3.0", optional = true }
lru = "0.12"
mutants = "0.0.3"
rand = "0.8"
rayon = "1.3.0"
readahead-iterator = "0.1.1"
regex = "1.3.9"
Expand Down
1 change: 0 additions & 1 deletion src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ pub enum Error {
impl From<jsonio::Error> for Error {
fn from(value: jsonio::Error) -> Self {
match value {
jsonio::Error::Io { source } => Error::IOError { source },
jsonio::Error::Json { source, path } => Error::DeserializeJson {
source,
path: path.to_string_lossy().into_owned(),
Expand Down
7 changes: 0 additions & 7 deletions src/jsonio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

//! Read and write JSON files.

use std::io;
use std::path::PathBuf;

use serde::de::DeserializeOwned;
Expand All @@ -22,12 +21,6 @@ use crate::transport::{self, Transport, WriteMode};

#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("IO error")]
Io {
#[from]
source: io::Error,
},

#[error("JSON serialization error")]
Json {
source: serde_json::Error,
Expand Down
Loading
Loading