Skip to content

Commit 3a296e5

Browse files
cruesslercruessler
committed
Rename range to range_in_blamed_file
1 parent 060f73d commit 3a296e5

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎gix-blame/tests/blame.rs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl From<LineRange> for Range<u32> {
116116

117117
#[derive(Debug, PartialEq)]
118118
struct BlameEntry {
119-
range: Range<u32>,
119+
range_in_blamed_file: Range<u32>,
120120
commit_id: ObjectId,
121121
}
122122

@@ -125,7 +125,7 @@ impl BlameEntry {
125125
assert!(range.end > range.start, "{range:?}");
126126

127127
Self {
128-
range: range.clone(),
128+
range_in_blamed_file: range.clone(),
129129
commit_id,
130130
}
131131
}
@@ -135,14 +135,14 @@ impl BlameEntry {
135135

136136
match offset {
137137
Offset::Added(added) => Self {
138-
range: (range.start + added)..(range.end + added),
138+
range_in_blamed_file: (range.start + added)..(range.end + added),
139139
commit_id,
140140
},
141141
Offset::Deleted(deleted) => {
142142
assert!(range.start >= deleted, "{range:?} {offset:?}");
143143

144144
Self {
145-
range: (range.start - deleted)..(range.end - deleted),
145+
range_in_blamed_file: (range.start - deleted)..(range.end - deleted),
146146
commit_id,
147147
}
148148
}
@@ -909,7 +909,7 @@ fn blame_file(worktree_path: PathBuf, file_path: &BStr) -> Vec<BlameEntry> {
909909

910910
// I don’t know yet whether it would make sense to use a data structure instead that preserves
911911
// order on insertion.
912-
lines_blamed.sort_by(|a, b| a.range.start.cmp(&b.range.start));
912+
lines_blamed.sort_by(|a, b| a.range_in_blamed_file.start.cmp(&b.range_in_blamed_file.start));
913913

914914
lines_blamed
915915
}
@@ -994,7 +994,7 @@ fn process_change_works_added_hunk() {
994994
assert_eq!(
995995
lines_blamed,
996996
vec![BlameEntry {
997-
range: 0..3,
997+
range_in_blamed_file: 0..3,
998998
commit_id: suspect
999999
}]
10001000
);
@@ -1029,7 +1029,7 @@ fn process_change_works_added_hunk_2() {
10291029
assert_eq!(
10301030
lines_blamed,
10311031
vec![BlameEntry {
1032-
range: 2..3,
1032+
range_in_blamed_file: 2..3,
10331033
commit_id: suspect
10341034
}]
10351035
);
@@ -1070,7 +1070,7 @@ fn process_change_works_added_hunk_3() {
10701070
assert_eq!(
10711071
lines_blamed,
10721072
vec![BlameEntry {
1073-
range: 12..13,
1073+
range_in_blamed_file: 12..13,
10741074
commit_id: suspect
10751075
}]
10761076
);
@@ -1112,7 +1112,7 @@ fn process_change_works_added_hunk_4() {
11121112
assert_eq!(
11131113
lines_blamed,
11141114
vec![BlameEntry {
1115-
range: 14..15,
1115+
range_in_blamed_file: 14..15,
11161116
commit_id: suspect
11171117
}]
11181118
);
@@ -1153,7 +1153,7 @@ fn process_change_works_added_hunk_5() {
11531153
assert_eq!(
11541154
lines_blamed,
11551155
vec![BlameEntry {
1156-
range: 0..3,
1156+
range_in_blamed_file: 0..3,
11571157
commit_id: suspect
11581158
}]
11591159
);
@@ -1189,7 +1189,7 @@ fn process_change_works_added_hunk_6() {
11891189
assert_eq!(
11901190
lines_blamed,
11911191
vec![BlameEntry {
1192-
range: 1..4,
1192+
range_in_blamed_file: 1..4,
11931193
commit_id: suspect
11941194
}]
11951195
);
@@ -1225,7 +1225,7 @@ fn process_change_works_added_hunk_7() {
12251225
assert_eq!(
12261226
lines_blamed,
12271227
vec![BlameEntry {
1228-
range: 4..6,
1228+
range_in_blamed_file: 4..6,
12291229
commit_id: suspect
12301230
}]
12311231
);
@@ -1261,7 +1261,7 @@ fn process_change_works_added_hunk_8() {
12611261
assert_eq!(
12621262
lines_blamed,
12631263
vec![BlameEntry {
1264-
range: 23..24,
1264+
range_in_blamed_file: 23..24,
12651265
commit_id: suspect
12661266
}]
12671267
);
@@ -1535,7 +1535,7 @@ fn process_changes_works_added_hunk() {
15351535
assert_eq!(
15361536
lines_blamed,
15371537
vec![BlameEntry {
1538-
range: 0..4,
1538+
range_in_blamed_file: 0..4,
15391539
commit_id: suspect
15401540
}]
15411541
);
@@ -1553,7 +1553,7 @@ fn process_changes_works_added_hunk_2() {
15531553
assert_eq!(
15541554
lines_blamed,
15551555
vec![BlameEntry {
1556-
range: 0..4,
1556+
range_in_blamed_file: 0..4,
15571557
commit_id: suspect
15581558
}]
15591559
);
@@ -1571,7 +1571,7 @@ fn process_changes_works_added_hunk_3() {
15711571
assert_eq!(
15721572
lines_blamed,
15731573
vec![BlameEntry {
1574-
range: 2..4,
1574+
range_in_blamed_file: 2..4,
15751575
commit_id: suspect
15761576
}]
15771577
);
@@ -1596,11 +1596,11 @@ fn process_changes_works_added_hunk_4_0() {
15961596
lines_blamed,
15971597
vec![
15981598
BlameEntry {
1599-
range: 0..1,
1599+
range_in_blamed_file: 0..1,
16001600
commit_id: suspect
16011601
},
16021602
BlameEntry {
1603-
range: 1..4,
1603+
range_in_blamed_file: 1..4,
16041604
commit_id: suspect
16051605
}
16061606
]
@@ -1619,7 +1619,7 @@ fn process_changes_works_added_hunk_4_1() {
16191619
assert_eq!(
16201620
lines_blamed,
16211621
vec![BlameEntry {
1622-
range: 0..1,
1622+
range_in_blamed_file: 0..1,
16231623
commit_id: suspect
16241624
}]
16251625
);
@@ -1630,7 +1630,7 @@ fn process_changes_works_added_hunk_4_1() {
16301630
fn process_changes_works_added_hunk_4_2() {
16311631
let suspect = ObjectId::null(gix_hash::Kind::Sha1);
16321632
let mut lines_blamed: Vec<BlameEntry> = vec![BlameEntry {
1633-
range: 0..2,
1633+
range_in_blamed_file: 0..2,
16341634
commit_id: suspect,
16351635
}];
16361636
let hunks_to_blame: Vec<UnblamedHunk> = vec![UnblamedHunk::new(2..6, Offset::Added(2))];
@@ -1641,11 +1641,11 @@ fn process_changes_works_added_hunk_4_2() {
16411641
lines_blamed,
16421642
vec![
16431643
BlameEntry {
1644-
range: 0..2,
1644+
range_in_blamed_file: 0..2,
16451645
commit_id: suspect
16461646
},
16471647
BlameEntry {
1648-
range: 2..3,
1648+
range_in_blamed_file: 2..3,
16491649
commit_id: suspect
16501650
}
16511651
]
@@ -1664,7 +1664,7 @@ fn process_changes_works_added_hunk_5() {
16641664
assert_eq!(
16651665
lines_blamed,
16661666
vec![BlameEntry {
1667-
range: 0..4,
1667+
range_in_blamed_file: 0..4,
16681668
commit_id: suspect
16691669
}]
16701670
);
@@ -1687,7 +1687,7 @@ fn process_changes_works_added_hunk_6() {
16871687
fn process_changes_works_added_hunk_7() {
16881688
let suspect = ObjectId::null(gix_hash::Kind::Sha1);
16891689
let mut lines_blamed: Vec<BlameEntry> = vec![BlameEntry {
1690-
range: 0..1,
1690+
range_in_blamed_file: 0..1,
16911691
commit_id: suspect,
16921692
}];
16931693
let hunks_to_blame: Vec<UnblamedHunk> = vec![UnblamedHunk::new(1..3, Offset::Added(1))];
@@ -1698,11 +1698,11 @@ fn process_changes_works_added_hunk_7() {
16981698
lines_blamed,
16991699
vec![
17001700
BlameEntry {
1701-
range: 0..1,
1701+
range_in_blamed_file: 0..1,
17021702
commit_id: suspect
17031703
},
17041704
BlameEntry {
1705-
range: 1..2,
1705+
range_in_blamed_file: 1..2,
17061706
commit_id: suspect
17071707
}
17081708
]
@@ -1722,11 +1722,11 @@ fn process_changes_works_added_hunk_8() {
17221722
lines_blamed,
17231723
vec![
17241724
BlameEntry {
1725-
range: 0..2,
1725+
range_in_blamed_file: 0..2,
17261726
commit_id: suspect
17271727
},
17281728
BlameEntry {
1729-
range: 3..4,
1729+
range_in_blamed_file: 3..4,
17301730
commit_id: suspect
17311731
}
17321732
]
@@ -1738,7 +1738,7 @@ fn process_changes_works_added_hunk_8() {
17381738
fn process_changes_works_added_hunk_9() {
17391739
let suspect = ObjectId::null(gix_hash::Kind::Sha1);
17401740
let mut lines_blamed: Vec<BlameEntry> = vec![BlameEntry {
1741-
range: 30..31,
1741+
range_in_blamed_file: 30..31,
17421742
commit_id: suspect,
17431743
}];
17441744
let hunks_to_blame: Vec<UnblamedHunk> = vec![
@@ -1758,17 +1758,17 @@ fn process_changes_works_added_hunk_9() {
17581758
];
17591759
let new_hunks_to_blame = process_changes(&mut lines_blamed, hunks_to_blame, changes, suspect);
17601760

1761-
lines_blamed.sort_by(|a, b| a.range.start.cmp(&b.range.start));
1761+
lines_blamed.sort_by(|a, b| a.range_in_blamed_file.start.cmp(&b.range_in_blamed_file.start));
17621762

17631763
assert_eq!(
17641764
lines_blamed,
17651765
vec![
17661766
BlameEntry {
1767-
range: 16..17,
1767+
range_in_blamed_file: 16..17,
17681768
commit_id: suspect
17691769
},
17701770
BlameEntry {
1771-
range: 30..31,
1771+
range_in_blamed_file: 30..31,
17721772
commit_id: suspect
17731773
}
17741774
]
@@ -1806,7 +1806,7 @@ fn process_changes_works_deleted_hunk() {
18061806
assert_eq!(
18071807
lines_blamed,
18081808
vec![BlameEntry {
1809-
range: 0..4,
1809+
range_in_blamed_file: 0..4,
18101810
commit_id: suspect
18111811
}]
18121812
);

0 commit comments

Comments
 (0)