File tree Expand file tree Collapse file tree 3 files changed +15
-14
lines changed Expand file tree Collapse file tree 3 files changed +15
-14
lines changed Original file line number Diff line number Diff line change @@ -221,7 +221,7 @@ impl<'a> convert::TryFrom<&'a str> for PartialName {
221
221
}
222
222
}
223
223
224
- #[ allow( clippy:: infallible_try_from ) ]
224
+ #[ allow( clippy:: fallible_impl_from ) ]
225
225
impl < ' a > convert:: TryFrom < & ' a FullName > for & ' a PartialNameRef {
226
226
type Error = Infallible ;
227
227
Original file line number Diff line number Diff line change @@ -1603,12 +1603,14 @@ pub fn main() -> Result<()> {
1603
1603
core:: repository:: blame:: blame_file (
1604
1604
repo,
1605
1605
& file,
1606
- gix:: blame:: Options {
1607
- diff_algorithm,
1608
- range : gix:: blame:: BlameRanges :: from_ranges ( ranges) ,
1609
- since,
1610
- rewrites : Some ( gix:: diff:: Rewrites :: default ( ) ) ,
1611
- debug_track_path : false ,
1606
+ {
1607
+ let mut opts = gix:: blame:: Options :: default ( ) ;
1608
+ opts. diff_algorithm = diff_algorithm;
1609
+ opts. range = gix:: blame:: BlameRanges :: from_ranges ( ranges) ;
1610
+ opts. since = since;
1611
+ opts. rewrites = Some ( gix:: diff:: Rewrites :: default ( ) ) ;
1612
+ opts. debug_track_path = false ;
1613
+ opts
1612
1614
} ,
1613
1615
out,
1614
1616
statistics. then_some ( err) ,
Original file line number Diff line number Diff line change @@ -35,13 +35,12 @@ pub(super) mod function {
35
35
let mut resource_cache = repo. diff_resource_cache_for_tree_diff ( ) ?;
36
36
let diff_algorithm = repo. diff_algorithm ( ) ?;
37
37
38
- let options = gix:: blame:: Options {
39
- diff_algorithm,
40
- range : gix:: blame:: BlameRanges :: default ( ) ,
41
- since : None ,
42
- rewrites : Some ( gix:: diff:: Rewrites :: default ( ) ) ,
43
- debug_track_path : true ,
44
- } ;
38
+ let mut options = gix:: blame:: Options :: default ( ) ;
39
+ options. diff_algorithm = diff_algorithm;
40
+ options. range = gix:: blame:: BlameRanges :: default ( ) ;
41
+ options. since = None ;
42
+ options. rewrites = Some ( gix:: diff:: Rewrites :: default ( ) ) ;
43
+ options. debug_track_path = true ;
45
44
46
45
let index = repo. index_or_empty ( ) ?;
47
46
You can’t perform that action at this time.
0 commit comments