Skip to content

Commit 800d4c4

Browse files
committed
Use Box<dyn> syntax
1 parent 91204b7 commit 800d4c4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fn main() {
7373
}
7474
}
7575

76-
fn run(squash: bool, max_commits: usize) -> Result<(), Box<Error>> {
76+
fn run(squash: bool, max_commits: usize) -> Result<(), Box<dyn Error>> {
7777
let repo = Repository::open(".")?;
7878
match repo.head() {
7979
Ok(head) => {
@@ -106,7 +106,7 @@ fn create_fixup_commit<'a>(
106106
diff: &'a Diff,
107107
squash: bool,
108108
max_commits: usize,
109-
) -> Result<Commit<'a>, Box<Error>> {
109+
) -> Result<Commit<'a>, Box<dyn Error>> {
110110
let diffstat = diff.stats()?;
111111
if diffstat.files_changed() == 0 {
112112
let dirty_workdir_stats = repo.diff_index_to_workdir(None, None)?.stats()?;
@@ -141,7 +141,7 @@ fn do_fixup_commit<'a>(
141141
head_branch: &'a Branch,
142142
commit_to_amend: &'a Commit,
143143
squash: bool,
144-
) -> Result<(), Box<Error>> {
144+
) -> Result<(), Box<dyn Error>> {
145145
let msg = if squash {
146146
format!("squash! {}", commit_to_amend.id())
147147
} else {
@@ -160,7 +160,7 @@ fn select_commit_to_amend<'a>(
160160
repo: &'a Repository,
161161
upstream: Option<Branch<'a>>,
162162
max_commits: usize,
163-
) -> Result<Commit<'a>, Box<Error>> {
163+
) -> Result<Commit<'a>, Box<dyn Error>> {
164164
let mut walker = repo.revwalk()?;
165165
walker.push_head()?;
166166
let commits = if let Some(upstream) = upstream {
@@ -194,7 +194,7 @@ fn select_commit_to_amend<'a>(
194194
Ok(repo.find_commit(commits[selected?].id())?)
195195
}
196196

197-
fn print_diff(kind: Changes) -> Result<(), Box<Error>> {
197+
fn print_diff(kind: Changes) -> Result<(), Box<dyn Error>> {
198198
let mut args = vec!["diff", "--stat"];
199199
if kind == Changes::Staged {
200200
args.push("--cached");

0 commit comments

Comments
 (0)