@@ -174,40 +174,52 @@ pub struct UnblamedHunk {
174
174
}
175
175
176
176
impl UnblamedHunk {
177
- pub fn new ( range : Range < u32 > , offset : Offset ) -> Self {
178
- assert ! ( range. end > range. start, "{range:?}" ) ;
177
+ pub fn new ( range_in_blamed_file : Range < u32 > , offset : Offset ) -> Self {
178
+ assert ! (
179
+ range_in_blamed_file. end > range_in_blamed_file. start,
180
+ "{range_in_blamed_file:?}"
181
+ ) ;
179
182
180
183
match offset {
181
184
Offset :: Added ( added) => {
182
- assert ! ( range. start >= added, "{range:?} {offset:?}" ) ;
183
- assert ! ( range. end >= added, "{range:?} {offset:?}" ) ;
185
+ assert ! (
186
+ range_in_blamed_file. start >= added,
187
+ "{range_in_blamed_file:?} {offset:?}"
188
+ ) ;
189
+ assert ! ( range_in_blamed_file. end >= added, "{range_in_blamed_file:?} {offset:?}" ) ;
184
190
185
191
Self {
186
- range_in_blamed_file : range . clone ( ) ,
187
- range_in_destination : ( range . start - added) ..( range . end - added) ,
192
+ range_in_blamed_file : range_in_blamed_file . clone ( ) ,
193
+ range_in_destination : ( range_in_blamed_file . start - added) ..( range_in_blamed_file . end - added) ,
188
194
}
189
195
}
190
196
Offset :: Deleted ( deleted) => Self {
191
- range_in_blamed_file : range . clone ( ) ,
192
- range_in_destination : ( range . start + deleted) ..( range . end + deleted) ,
197
+ range_in_blamed_file : range_in_blamed_file . clone ( ) ,
198
+ range_in_destination : ( range_in_blamed_file . start + deleted) ..( range_in_blamed_file . end + deleted) ,
193
199
} ,
194
200
}
195
201
}
196
202
197
- fn from_destination ( range : Range < u32 > , offset : Offset ) -> Self {
198
- assert ! ( range. end > range. start, "{range:?}" ) ;
203
+ fn from_destination ( range_in_destination : Range < u32 > , offset : Offset ) -> Self {
204
+ assert ! (
205
+ range_in_destination. end > range_in_destination. start,
206
+ "{range_in_destination:?}"
207
+ ) ;
199
208
200
209
match offset {
201
210
Offset :: Added ( added) => Self {
202
- range_in_blamed_file : ( range . start + added) ..( range . end + added) ,
203
- range_in_destination : range . clone ( ) ,
211
+ range_in_blamed_file : ( range_in_destination . start + added) ..( range_in_destination . end + added) ,
212
+ range_in_destination : range_in_destination . clone ( ) ,
204
213
} ,
205
214
Offset :: Deleted ( deleted) => {
206
- assert ! ( range. start >= deleted, "{range:?} {offset:?}" ) ;
215
+ assert ! (
216
+ range_in_destination. start >= deleted,
217
+ "{range_in_destination:?} {offset:?}"
218
+ ) ;
207
219
208
220
Self {
209
- range_in_blamed_file : ( range . start - deleted) ..( range . end - deleted) ,
210
- range_in_destination : range . clone ( ) ,
221
+ range_in_blamed_file : ( range_in_destination . start - deleted) ..( range_in_destination . end - deleted) ,
222
+ range_in_destination : range_in_destination . clone ( ) ,
211
223
}
212
224
}
213
225
}
0 commit comments