diff options
author | Lars Wirzenius <liw@liw.fi> | 2023-10-21 06:19:53 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2023-10-21 06:19:53 +0000 |
commit | 420646fa118d375d2871452d03638e3472ecf031 (patch) | |
tree | f27bbacd84dba319b72935ac4e54e279c3f48648 | |
parent | 78ddb293c6b010f7b456a09392525db44b41a9ee (diff) | |
parent | c667532dedb23188be7cb59d26994060c67e0c38 (diff) | |
download | obnam2-420646fa118d375d2871452d03638e3472ecf031.tar.gz |
Merge branch 'liw/fix' into 'main'
fix(obnam.md): adapt to error message that has changed slightly
See merge request obnam/obnam!248
-rw-r--r-- | obnam.md | 2 | ||||
-rw-r--r-- | src/accumulated_time.rs | 4 | ||||
-rw-r--r-- | src/backup_progress.rs | 8 | ||||
-rw-r--r-- | src/chunker.rs | 3 | ||||
-rw-r--r-- | src/cmd/restore.rs | 2 |
5 files changed, 9 insertions, 10 deletions
@@ -1448,7 +1448,7 @@ and a client config based on ca-required.yaml and a file live/data.dat containing some random data when I try to run obnam backup then command fails -then stderr contains "self signed certificate" +then stderr matches regex self.signed certificate ~~~ ~~~{#ca-required.yaml .file .yaml .numberLines} diff --git a/src/accumulated_time.rs b/src/accumulated_time.rs index e633a10..cdf34b2 100644 --- a/src/accumulated_time.rs +++ b/src/accumulated_time.rs @@ -37,7 +37,7 @@ impl<T: Eq + PartialEq + Hash + Copy> AccumulatedTime<T> { /// clock is stopped. pub fn start(&mut self, clock: T) { let mut map = self.accumulated.lock().unwrap(); - let ct = map.entry(clock).or_insert_with(ClockTime::default); + let ct = map.entry(clock).or_default(); assert!(ct.started.is_none()); ct.started = Some(Instant::now()); } @@ -47,7 +47,7 @@ impl<T: Eq + PartialEq + Hash + Copy> AccumulatedTime<T> { /// Its run time is added to the accumulated time for that kind of clock. pub fn stop(&mut self, clock: T) { let mut map = self.accumulated.lock().unwrap(); - if let Some(mut ct) = map.get_mut(&clock) { + if let Some(ct) = map.get_mut(&clock) { assert!(ct.started.is_some()); if let Some(started) = ct.started.take() { ct.nanos += started.elapsed().as_nanos(); diff --git a/src/backup_progress.rs b/src/backup_progress.rs index f119210..1e6805c 100644 --- a/src/backup_progress.rs +++ b/src/backup_progress.rs @@ -22,7 +22,7 @@ impl BackupProgress { } else { ProgressBar::hidden() }; - let parts = vec![ + let parts = [ "initial backup", "elapsed: {elapsed}", "files: {pos}", @@ -42,7 +42,7 @@ impl BackupProgress { } else { ProgressBar::hidden() }; - let parts = vec![ + let parts = [ "incremental backup", "{wide_bar}", "elapsed: {elapsed}", @@ -59,7 +59,7 @@ impl BackupProgress { /// Create a progress bar for uploading a new generation's metadata. pub fn upload_generation() -> Self { let progress = ProgressBar::new(0); - let parts = vec![ + let parts = [ "uploading new generation metadata", "elapsed: {elapsed}", "{spinner}", @@ -74,7 +74,7 @@ impl BackupProgress { /// metadata. pub fn download_generation(gen_id: &GenId) -> Self { let progress = ProgressBar::new(0); - let parts = vec!["{msg}", "elapsed: {elapsed}", "{spinner}"]; + let parts = ["{msg}", "elapsed: {elapsed}", "{spinner}"]; progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n"))); progress.enable_steady_tick(100); progress.set_message(format!( diff --git a/src/chunker.rs b/src/chunker.rs index 29f8a90..9883f89 100644 --- a/src/chunker.rs +++ b/src/chunker.rs @@ -31,8 +31,7 @@ impl FileChunks { filename: &Path, kind: LabelChecksumKind, ) -> Self { - let mut buf = vec![]; - buf.resize(chunk_size, 0); + let buf = vec![0; chunk_size]; Self { chunk_size, kind, diff --git a/src/cmd/restore.rs b/src/cmd/restore.rs index c4c06d2..dff72fa 100644 --- a/src/cmd/restore.rs +++ b/src/cmd/restore.rs @@ -299,7 +299,7 @@ fn create_progress_bar(file_count: FileId, verbose: bool) -> ProgressBar { } else { ProgressBar::hidden() }; - let parts = vec![ + let parts = [ "{wide_bar}", "elapsed: {elapsed}", "files: {pos}/{len}", |