@@ -73,7 +73,7 @@ fn main() {
73
73
}
74
74
}
75
75
76
- fn run ( squash : bool , max_commits : usize ) -> Result < ( ) , Box < Error > > {
76
+ fn run ( squash : bool , max_commits : usize ) -> Result < ( ) , Box < dyn Error > > {
77
77
let repo = Repository :: open ( "." ) ?;
78
78
match repo. head ( ) {
79
79
Ok ( head) => {
@@ -106,7 +106,7 @@ fn create_fixup_commit<'a>(
106
106
diff : & ' a Diff ,
107
107
squash : bool ,
108
108
max_commits : usize ,
109
- ) -> Result < Commit < ' a > , Box < Error > > {
109
+ ) -> Result < Commit < ' a > , Box < dyn Error > > {
110
110
let diffstat = diff. stats ( ) ?;
111
111
if diffstat. files_changed ( ) == 0 {
112
112
let dirty_workdir_stats = repo. diff_index_to_workdir ( None , None ) ?. stats ( ) ?;
@@ -141,7 +141,7 @@ fn do_fixup_commit<'a>(
141
141
head_branch : & ' a Branch ,
142
142
commit_to_amend : & ' a Commit ,
143
143
squash : bool ,
144
- ) -> Result < ( ) , Box < Error > > {
144
+ ) -> Result < ( ) , Box < dyn Error > > {
145
145
let msg = if squash {
146
146
format ! ( "squash! {}" , commit_to_amend. id( ) )
147
147
} else {
@@ -160,7 +160,7 @@ fn select_commit_to_amend<'a>(
160
160
repo : & ' a Repository ,
161
161
upstream : Option < Branch < ' a > > ,
162
162
max_commits : usize ,
163
- ) -> Result < Commit < ' a > , Box < Error > > {
163
+ ) -> Result < Commit < ' a > , Box < dyn Error > > {
164
164
let mut walker = repo. revwalk ( ) ?;
165
165
walker. push_head ( ) ?;
166
166
let commits = if let Some ( upstream) = upstream {
@@ -194,7 +194,7 @@ fn select_commit_to_amend<'a>(
194
194
Ok ( repo. find_commit ( commits[ selected?] . id ( ) ) ?)
195
195
}
196
196
197
- fn print_diff ( kind : Changes ) -> Result < ( ) , Box < Error > > {
197
+ fn print_diff ( kind : Changes ) -> Result < ( ) , Box < dyn Error > > {
198
198
let mut args = vec ! [ "diff" , "--stat" ] ;
199
199
if kind == Changes :: Staged {
200
200
args. push ( "--cached" ) ;
0 commit comments