Skip to content

Commit 7cb3063

Browse files
mrewoolfg
authored andcommitted
Fix clippy warnings
1 parent cfc6076 commit 7cb3063

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/merge.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::{git, parser::ParseState, types::Timeline};
44
use anyhow::Result;
55

66
/// Merger merges multiple timelines into one
7-
#[derive(Debug)]
7+
#[derive(Debug, Default)]
88
pub struct Merger {
99
state: ParseState,
1010
}
@@ -39,12 +39,12 @@ impl Merger {
3939
for timeline in timelines {
4040
self.merge_timeline(timeline)?
4141
}
42-
Ok(Timeline::try_from(&self.state)?)
42+
Timeline::try_from(&self.state)
4343
}
4444

4545
/// Return the merged timeline of all inputs
4646
pub fn timeline(&self) -> Result<Timeline> {
47-
Ok(Timeline::try_from(&self.state)?)
47+
Timeline::try_from(&self.state)
4848
}
4949
}
5050

src/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ impl Parser {
204204
}
205205
}
206206

207-
Ok(Timeline::try_from(&self.state)?)
207+
Timeline::try_from(&self.state)
208208
}
209209
}
210210

0 commit comments

Comments
 (0)