diff options
author | Tim Oram <dev@mitmaro.ca> | 2022-03-14 16:37:10 -0230 |
---|---|---|
committer | Tim Oram <dev@mitmaro.ca> | 2022-03-14 16:52:23 -0230 |
commit | 876ce170aacaba1a8241ddfc0a10e988f58f73ad (patch) | |
tree | b8ca69398b7a3812186a7ed9e010dfb8c8d99b10 | |
parent | 13264f3252ed731f06f4e6bac88a29ac95be92e1 (diff) |
Remove git module from core crate
This git module was created to allow a thread safe version of the git
repository. Since the git crate now is thread safe, this wrapper is no
longer needed.
-rw-r--r-- | src/core/Cargo.toml | 2 | ||||
-rw-r--r-- | src/core/src/git.rs | 22 | ||||
-rw-r--r-- | src/core/src/lib.rs | 1 | ||||
-rw-r--r-- | src/core/src/modules/show_commit/mod.rs | 11 | ||||
-rw-r--r-- | src/core/src/modules/show_commit/tests.rs | 82 | ||||
-rw-r--r-- | src/core/src/run.rs | 7 | ||||
-rw-r--r-- | src/core/src/tests.rs | 5 | ||||
-rw-r--r-- | src/git/src/reference.rs | 10 |
8 files changed, 53 insertions, 87 deletions
diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index ac7b8d8..459fdc6 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -19,7 +19,6 @@ anyhow = "1.0.53" captur = "0.1.0" lazy_static = "1.4.0" num-format = "0.4.0" -parking_lot = "0.12.0" pico-args = "0.4.2" unicode-segmentation = "1.9.0" girt-config = {version = "1.0.0", path = "../../src/config"} @@ -31,6 +30,7 @@ girt-view = {version = "1.1.0", path = "../../src/view"} [dev-dependencies] captur = "0.1.0" +parking_lot = "0.12.0" rstest = "0.12.0" serial_test = "0.5.1" tempfile = "3.3.0" diff --git a/src/core/src/git.rs b/src/core/src/git.rs deleted file mode 100644 index 315258f..0000000 --- a/src/core/src/git.rs +++ /dev/null @@ -1,22 +0,0 @@ -use std::sync::Arc; - -use anyhow::Result; -use git::{CommitDiff, CommitDiffLoaderOptions, Repository}; -use parking_lot::Mutex; - -#[derive(Debug, Clone)] -pub(crate) struct Git { - repository: Arc<Mutex<Repository>>, -} - -impl Git { - pub(crate) fn new(repository: Repository) -> Self { - Self { - repository: Arc::new(Mutex::new(repository)), - } - } - - pub(crate) fn load_commit_diff(&self, hash: &str, config: &CommitDiffLoaderOptions) -> Result<CommitDiff> { - self.repository.lock().load_commit_diff(hash, config) - } -} diff --git a/src/core/src/lib.rs b/src/core/src/lib.rs index e08c650..df5e811 100644 --- a/src/core/src/lib.rs +++ b/src/core/src/lib.rs @@ -84,7 +84,6 @@ mod arguments; mod components; mod exit; -mod git; mod help; mod license; mod module; diff --git a/src/core/src/modules/show_commit/mod.rs b/src/core/src/modules/show_commit/mod.rs index 6380357..730f2dc 100644 --- a/src/core/src/modules/show_commit/mod.rs +++ b/src/core/src/modules/show_commit/mod.rs @@ -8,7 +8,7 @@ mod tests; use anyhow::anyhow; use captur::capture; use config::{Config, DiffIgnoreWhitespaceSetting, DiffShowWhitespaceSetting}; -use git::{CommitDiff, CommitDiffLoaderOptions}; +use git::{CommitDiff, CommitDiffLoaderOptions, Repository}; use input::{Event, InputOptions, KeyBindings, MetaEvent}; use lazy_static::lazy_static; use todo_file::TodoFile; @@ -21,7 +21,6 @@ use self::{ }; use crate::{ components::help::{Help, INPUT_OPTIONS as HELP_INPUT_OPTIONS}, - git::Git, module::{Module, ProcessResult, State}, }; @@ -35,7 +34,7 @@ pub(crate) struct ShowCommit { diff_view_data: ViewData, help: Help, overview_view_data: ViewData, - git: Git, + repository: Repository, state: ShowCommitState, view_builder: ViewBuilder, } @@ -61,7 +60,7 @@ impl Module for ShowCommit { }); let new_diff = self - .git + .repository .load_commit_diff(selected_line.get_hash(), &self.commit_diff_loader_options); match new_diff { @@ -174,7 +173,7 @@ impl Module for ShowCommit { } impl ShowCommit { - pub(crate) fn new(config: &Config, git: Git) -> Self { + pub(crate) fn new(config: &Config, repository: Repository) -> Self { let overview_view_data = ViewData::new(|updater| { updater.set_show_title(true); updater.set_show_help(true); @@ -209,7 +208,7 @@ impl ShowCommit { overview_view_data, state: ShowCommitState::Overview, view_builder: ViewBuilder::new(view_builder_options), - git, + repository, } } } diff --git a/src/core/src/modules/show_commit/tests.rs b/src/core/src/modules/show_commit/tests.rs index 4446d5d..1f27d4e 100644 --- a/src/core/src/modules/show_commit/tests.rs +++ b/src/core/src/modules/show_commit/tests.rs @@ -20,7 +20,7 @@ fn load_commit_during_activate() { let oid = head_id(&repo, "main"); let line = format!("pick {} comment1", oid.to_string()); module_test(&[line.as_str()], &[], |test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); assert_process_result!(test_context.activate(&mut module, State::List)); assert!(module.diff.is_some()); }); @@ -34,7 +34,7 @@ fn cached_commit_in_activate() { let oid = head_id(&repo, "main"); let line = format!("pick {} comment1", oid.to_string()); module_test(&[line.as_str()], &[], |test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); // would be nice to be able to test that a second call to load_commit_diff did not happen here assert_process_result!(test_context.activate(&mut module, State::List)); assert_process_result!(test_context.activate(&mut module, State::List)); @@ -47,7 +47,7 @@ fn cached_commit_in_activate() { fn no_selected_line_in_activate() { with_temp_repository(|repo| { module_test(&[], &[], |test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); assert_process_result!( test_context.activate(&mut module, State::List), state = State::List, @@ -62,7 +62,7 @@ fn no_selected_line_in_activate() { fn activate_error() { with_temp_repository(|repo| { module_test(&["pick aaaaaaaaaa comment1"], &[], |test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); assert_process_result!( test_context.activate(&mut module, State::List), state = State::List, @@ -85,7 +85,7 @@ fn render_overview_minimal_commit() { let commit = CommitBuilder::new("0123456789abcdef0123456789abcdef").build(); let commit_date = commit.committed_date().format("%c %z").to_string(); let diff = CommitDiffBuilder::new(commit).build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -115,7 +115,7 @@ fn render_overview_minimal_commit_compact() { let commit = CommitBuilder::new("0123456789abcdef0123456789abcdef").build(); let commit_date = commit.committed_date().format("%c %z").to_string(); let diff = CommitDiffBuilder::new(commit).build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -146,7 +146,7 @@ fn render_overview_with_author() { .build(), ) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -174,7 +174,7 @@ fn render_overview_with_author_compact() { .build(), ) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -201,7 +201,7 @@ fn render_overview_with_committer() { .build(), ) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -229,7 +229,7 @@ fn render_overview_with_committer_compact() { .build(), ) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -256,7 +256,7 @@ fn render_overview_with_commit_summary() { .build(), ) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -283,7 +283,7 @@ fn render_overview_with_commit_body() { .build(), ) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -311,7 +311,7 @@ fn render_overview_with_commit_summary_and_body() { .build(), ) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -374,7 +374,7 @@ fn render_overview_with_file_stats() { .build(), ]) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -443,7 +443,7 @@ fn render_overview_with_file_stats_compact() { .build(), ]) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -473,7 +473,7 @@ fn render_overview_single_file_changed() { let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()) .number_files_changed(1) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -497,7 +497,7 @@ fn render_overview_more_than_one_file_changed() { let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()) .number_files_changed(2) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -522,7 +522,7 @@ fn render_overview_single_insertion() { let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()) .number_insertions(1) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -547,7 +547,7 @@ fn render_overview_more_than_one_insertion() { let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()) .number_insertions(2) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -572,7 +572,7 @@ fn render_overview_single_deletion() { let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()) .number_deletions(1) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -597,7 +597,7 @@ fn render_overview_more_than_one_deletion() { let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()) .number_deletions(2) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -623,7 +623,7 @@ fn render_diff_minimal_commit() { config.diff_show_whitespace = DiffShowWhitespaceSetting::None; let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()).build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -654,7 +654,7 @@ fn render_diff_minimal_commit_compact() { config.diff_show_whitespace = DiffShowWhitespaceSetting::None; let diff = CommitDiffBuilder::new(CommitBuilder::new("0123456789abcdef0123456789abcdef").build()).build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -719,7 +719,7 @@ fn render_diff_basic_file_stats() { .build(), ]) .build(); - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -770,7 +770,7 @@ fn render_diff_end_new_line_missing() { .push_delta(delta) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -813,7 +813,7 @@ fn render_diff_add_line() { .push_delta(delta) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -855,7 +855,7 @@ fn render_diff_delete_line() { .push_delta(delta) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -900,7 +900,7 @@ fn render_diff_context_add_remove_lines() { .push_delta(delta) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -968,7 +968,7 @@ fn render_diff_show_both_whitespace() { .push_delta(generate_white_space_delta()) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -1008,7 +1008,7 @@ fn render_diff_show_leading_whitespace() { .push_delta(generate_white_space_delta()) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -1048,7 +1048,7 @@ fn render_diff_show_no_whitespace() { .push_delta(generate_white_space_delta()) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -1090,7 +1090,7 @@ fn render_diff_show_whitespace_all_spaces() { .push_delta(delta) .build()]) .build(); - let mut module = ShowCommit::new(&config, Git::new(repo)); + let mut module = ShowCommit::new(&config, repo); module.diff = Some(diff); module.state = ShowCommitState::Diff; assert_rendered_output!( @@ -1111,7 +1111,7 @@ fn handle_event_toggle_diff_to_overview() { &["pick 0123456789abcdef0123456789abcdef c1"], &[Event::from(MetaEvent::ShowDiff)], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module .diff_view_data .update_view_data(|updater| updater.push_line(ViewLine::from("foo"))); @@ -1135,7 +1135,7 @@ fn handle_event_toggle_overview_to_diff() { &["pick 0123456789abcdef0123456789abcdef c1"], &[Event::from('d')], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module .overview_view_data .update_view_data(|updater| updater.push_line(ViewLine::from("foo"))); @@ -1159,7 +1159,7 @@ fn handle_event_resize() { &["pick 0123456789abcdef0123456789abcdef c1"], &[Event::Resize(100, 100)], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); assert_process_result!(test_context.handle_event(&mut module), event = Event::Resize(100, 100)); }, ); @@ -1171,7 +1171,7 @@ fn handle_event_resize() { fn render_help() { with_temp_repository(|repo| { module_test(&["pick aaa c1"], &[Event::from(MetaEvent::Help)], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); let _ = test_context.handle_all_events(&mut module); assert_rendered_output!( test_context.build_view_data(&mut module), @@ -1199,7 +1199,7 @@ fn render_help() { fn handle_help_event_show() { with_temp_repository(|repo| { module_test(&["pick aaa c1"], &[Event::from(MetaEvent::Help)], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); let _ = test_context.handle_all_events(&mut module); assert!(module.help.is_active()); }); @@ -1213,7 +1213,7 @@ fn handle_help_event_hide() { &["pick aaa c1"], &[Event::from(MetaEvent::Help), Event::from('?')], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); let _ = test_context.handle_all_events(&mut module); assert!(!module.help.is_active()); }, @@ -1229,7 +1229,7 @@ fn handle_event_other_key_from_diff() { &["pick 0123456789abcdef0123456789abcdef c1"], &[Event::from('a')], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.state = ShowCommitState::Diff; assert_process_result!(test_context.handle_event(&mut module), event = Event::from('a')); assert_eq!(module.state, ShowCommitState::Overview); @@ -1246,7 +1246,7 @@ fn handle_event_other_key_from_overview() { &["pick 0123456789abcdef0123456789abcdef c1"], &[Event::from('a')], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); module.state = ShowCommitState::Overview; assert_process_result!( test_context.handle_event(&mut module), @@ -1269,7 +1269,7 @@ fn handle_event_other_key_from_overview() { fn scroll_events(#[case] event: MetaEvent) { with_temp_repository(|repo| { module_test(&[], &[Event::from(event)], |mut test_context| { - let mut module = ShowCommit::new(&Config::new(), Git::new(repo)); + let mut module = ShowCommit::new(&Config::new(), repo); assert_process_result!(test_context.handle_event(&mut module), event = Event::from(event)); }); Ok(()) diff --git a/src/core/src/run.rs b/src/core/src/run.rs index 833d3cf..b8ffa5e 100644 --- a/src/core/src/run.rs +++ b/src/core/src/run.rs @@ -12,7 +12,6 @@ use view::View; use crate::{ arguments::Args, exit::Exit, - git::Git, help::build_help, module::{ExitStatus, Modules, State}, modules::{ConfirmAbort, ConfirmRebase, Error, ExternalEditor, Insert, List, ShowCommit, WindowSizeError}, @@ -46,11 +45,11 @@ pub(super) fn load_todo_file(filepath: &str, config: &Config) -> Result<TodoFile Ok(todo_file) } -pub(super) fn create_modules(config: &Config, git: Git) -> Modules<'_> { +pub(super) fn create_modules(config: &Config, repository: Repository) -> Modules<'_> { let mut modules = Modules::new(EventHandler::new(KeyBindings::new(&config.key_bindings))); modules.register_module(State::Error, Error::new()); modules.register_module(State::List, List::new(config)); - modules.register_module(State::ShowCommit, ShowCommit::new(config, git)); + modules.register_module(State::ShowCommit, ShowCommit::new(config, repository)); modules.register_module(State::WindowSizeError, WindowSizeError::new()); modules.register_module( State::ConfirmAbort, @@ -111,7 +110,7 @@ pub(crate) fn run(args: &Args) -> Exit { }; let process = create_process(todo_file, &config); - run_process(process, create_modules(&config, Git::new(repo))) + run_process(process, create_modules(&config, repo)) } else { Exit::new( diff --git a/src/core/src/tests.rs b/src/core/src/tests.rs index c0f986e..e0d49e5 100644 --- a/src/core/src/tests.rs +++ b/src/core/src/tests.rs @@ -5,7 +5,6 @@ use input::{Event, MetaEvent}; use super::*; use crate::{ - git::Git, module::{ExitStatus, ProcessResult, State}, run::{create_modules, create_process, load_config, load_todo_file, run_process}, testutil::TestModule, @@ -139,7 +138,7 @@ fn run_process_error() { let process = create_process(rebase_todo_file, &config); let mut module = TestModule::new(); module.event_callback(move |_, _, _| ProcessResult::from(Event::from(MetaEvent::Exit))); - let mut modules = create_modules(&config, Git::new(repo)); + let mut modules = create_modules(&config, repo); modules.register_module(State::WindowSizeError, module); assert_eq!( run_process(process, modules), @@ -161,7 +160,7 @@ fn run_process_success() { let process = create_process(rebase_todo_file, &config); let mut module = TestModule::new(); module.event_callback(move |_, _, _| ProcessResult::from(Event::from(MetaEvent::Exit))); - let mut modules = create_modules(&config, Git::new(repo)); + let mut modules = create_modules(&config, repo); modules.register_module(State::WindowSizeError, module); assert_eq!(run_process(process, modules), Exit::from(ExitStatus::Abort)); } diff --git a/src/git/src/reference.rs b/src/git/src/reference.rs index 111bce8..34a0f2d 100644 --- a/src/git/src/reference.rs +++ b/src/git/src/reference.rs @@ -67,19 +67,11 @@ mod tests { use super::*; use crate::testutil::{head_id, with_temp_repository}; - // macro_rules! e { - // ($e:expr) => { - // $e.map_err(|e| anyhow!("{}", e.message())) { - // }; - // } - #[test] fn test() { with_temp_repository(|repository| { let oid = head_id(&repository, "main"); - let reference = repository - .find_reference("refs/heads/main") - .map_err(|e| Error::from(e))?; + let reference = repository.find_reference("refs/heads/main").map_err(Error::from)?; assert_eq!(reference.hash(), format!("{}", oid)); assert_eq!(reference.name(), "refs/heads/main"); assert_eq!(reference.shortname(), "main"); |