Skip to content

Commit fa9cfab

Browse files
committed
refactor (#16)
1 parent 2d3a182 commit fa9cfab

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed
File renamed without changes.

tests/index/mod.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crates_index_diff::Index;
22
use git_testtools::tempfile::TempDir;
33
use std::path::PathBuf;
44

5-
mod changes_from_objects;
5+
mod changes_between_commits;
66

77
const NUM_CHANGES_SINCE_EVER: usize = 3516;
88

@@ -46,10 +46,10 @@ fn clone_if_needed() {
4646
}
4747

4848
#[test]
49-
fn quick_changes_since_last_fetch() {
50-
let (index, _tmp) = index_rw().unwrap();
49+
fn quick_changes_since_last_fetch() -> crate::Result {
50+
let (index, _tmp) = index_rw()?;
5151
assert!(index.last_seen_reference().is_err(), "no marker exists");
52-
let num_changes_since_first_commit = index.fetch_changes().unwrap().len();
52+
let num_changes_since_first_commit = index.fetch_changes()?.len();
5353
assert_eq!(
5454
num_changes_since_first_commit, NUM_CHANGES_SINCE_EVER,
5555
"all changes since ever"
@@ -59,8 +59,7 @@ fn quick_changes_since_last_fetch() {
5959
.expect("must be created/update now");
6060
let remote_main = index
6161
.repository()
62-
.find_reference("refs/remotes/origin/main")
63-
.unwrap();
62+
.find_reference("refs/remotes/origin/main")?;
6463
assert_eq!(
6564
marker.target(),
6665
remote_main.target(),
@@ -72,16 +71,15 @@ fn quick_changes_since_last_fetch() {
7271
.set_target_id(
7372
index
7473
.repository()
75-
.rev_parse(format!("{}~2", index.seen_ref_name).as_str())
76-
.unwrap()
74+
.rev_parse(format!("{}~2", index.seen_ref_name).as_str())?
7775
.single()
7876
.unwrap(),
7977
"resetting to previous commit",
8078
)
8179
.expect("reset success");
82-
let num_seen_after_reset = index.fetch_changes().unwrap().len();
80+
let num_seen_after_reset = index.fetch_changes()?.len();
8381
assert_eq!(
84-
index.last_seen_reference().unwrap().target(),
82+
index.last_seen_reference()?.target(),
8583
remote_main.target(),
8684
"seen branch was updated again"
8785
);
@@ -91,10 +89,11 @@ fn quick_changes_since_last_fetch() {
9189
);
9290

9391
assert_eq!(
94-
index.fetch_changes().unwrap().len(),
92+
index.fetch_changes()?.len(),
9593
0,
9694
"nothing if there was no change"
9795
);
96+
Ok(())
9897
}
9998

10099
fn index_ro() -> crate::Result<Index> {

0 commit comments

Comments
 (0)