@@ -174,40 +174,52 @@ pub struct UnblamedHunk {
174174}
175175
176176impl 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+ ) ;
179182
180183 match offset {
181184 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:?}" ) ;
184190
185191 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) ,
188194 }
189195 }
190196 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) ,
193199 } ,
194200 }
195201 }
196202
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+ ) ;
199208
200209 match offset {
201210 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 ( ) ,
204213 } ,
205214 Offset :: Deleted ( deleted) => {
206- assert ! ( range. start >= deleted, "{range:?} {offset:?}" ) ;
215+ assert ! (
216+ range_in_destination. start >= deleted,
217+ "{range_in_destination:?} {offset:?}"
218+ ) ;
207219
208220 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 ( ) ,
211223 }
212224 }
213225 }
0 commit comments