Skip to content

Commit 2b508d2

Browse files
MitMaroMitMaro
committed
Remove unused new functions in config module
1 parent 779e7c8 commit 2b508d2

File tree

6 files changed

+20
-45
lines changed

6 files changed

+20
-45
lines changed

‎src/config/key_bindings.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,6 @@ pub(crate) struct KeyBindings {
114114
}
115115

116116
impl KeyBindings {
117-
/// Create a new configuration with default values.
118-
#[must_use]
119-
#[allow(clippy::missing_panics_doc)]
120-
pub(crate) fn new() -> Self {
121-
Self::new_with_config(None).unwrap() // should never error with None config
122-
}
123-
124117
pub(super) fn new_with_config(git_config: Option<&Config>) -> Result<Self, ConfigError> {
125118
let confirm_no = get_input(git_config, "interactive-rebase-tool.inputConfirmNo", "n")?
126119
.iter()
@@ -202,7 +195,7 @@ mod tests {
202195

203196
macro_rules! config_test {
204197
($key:ident, $config_name:literal, $default:literal) => {
205-
let config = KeyBindings::new();
198+
let config = KeyBindings::new_with_config(None).unwrap();
206199
let value = config.$key[0].as_str();
207200
assert_eq!(
208201
value,
@@ -229,11 +222,6 @@ mod tests {
229222
};
230223
}
231224

232-
#[test]
233-
fn new() {
234-
let _config = KeyBindings::new();
235-
}
236-
237225
#[test]
238226
fn try_from_git_config() {
239227
with_git_config(&[], |git_config| {

‎src/config/theme.rs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,8 @@ pub(crate) struct Theme {
7474
}
7575

7676
impl Theme {
77-
/// Create a new configuration with default values.
78-
#[must_use]
79-
#[allow(clippy::missing_panics_doc)]
80-
pub(crate) fn new() -> Self {
81-
Self::new_with_config(None).unwrap() // should never error with None config
82-
}
83-
8477
/// Create a new theme from a Git Config reference.
85-
pub(super) fn new_with_config(git_config: Option<&Config>) -> Result<Self, ConfigError> {
78+
pub(crate) fn new_with_config(git_config: Option<&Config>) -> Result<Self, ConfigError> {
8679
Ok(Self {
8780
character_vertical_spacing: get_string(
8881
git_config,
@@ -152,7 +145,7 @@ mod tests {
152145

153146
macro_rules! config_test {
154147
($key:ident, $config_name:literal, $default:expr) => {
155-
let config = Theme::new();
148+
let config = Theme::new_with_config(None).unwrap();
156149
let value = config.$key;
157150
assert_eq!(
158151
value,
@@ -179,11 +172,6 @@ mod tests {
179172
};
180173
}
181174

182-
#[test]
183-
fn new() {
184-
let _config = Theme::new();
185-
}
186-
187175
#[test]
188176
fn try_from_git_config() {
189177
with_git_config(&[], |git_config| {
@@ -200,7 +188,7 @@ mod tests {
200188

201189
#[test]
202190
fn character_vertical_spacing() {
203-
assert_eq!(Theme::new().character_vertical_spacing, "~");
191+
assert_eq!(Theme::new_with_config(None).unwrap().character_vertical_spacing, "~");
204192
with_git_config(
205193
&["[interactive-rebase-tool]", "verticalSpacingCharacter = \"X\""],
206194
|config| {

‎src/display.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -369,16 +369,20 @@ mod tests {
369369
use super::*;
370370
use crate::test_helpers::mocks;
371371

372+
fn create_theme() -> Theme {
373+
Theme::new_with_config(None).unwrap()
374+
}
375+
372376
#[test]
373377
fn draw_str() {
374-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
378+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
375379
display.draw_str("Test String").unwrap();
376380
assert_eq!(display.tui.get_output(), &["Test String"]);
377381
}
378382

379383
#[test]
380384
fn clear() {
381-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
385+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
382386
display.draw_str("Test String").unwrap();
383387
display.set_dim(true).unwrap();
384388
display.set_reverse(true).unwrap();
@@ -392,7 +396,7 @@ mod tests {
392396

393397
#[test]
394398
fn refresh() {
395-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
399+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
396400
display.refresh().unwrap();
397401
assert!(!display.tui.is_dirty());
398402
}
@@ -532,7 +536,7 @@ mod tests {
532536
#[case] expected_foreground: CrosstermColor,
533537
#[case] expected_background: CrosstermColor,
534538
) {
535-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
539+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
536540
display.color(display_color, selected).unwrap();
537541
assert!(
538542
display
@@ -551,7 +555,7 @@ mod tests {
551555
#[case::dim_underline(true, true, false)]
552556
#[case::all_on(true, true, true)]
553557
fn style(#[case] dim: bool, #[case] underline: bool, #[case] reverse: bool) {
554-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
558+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
555559
display.set_style(dim, underline, reverse).unwrap();
556560
assert_eq!(display.tui.is_dimmed(), dim);
557561
assert_eq!(display.tui.is_underline(), underline);
@@ -560,21 +564,21 @@ mod tests {
560564

561565
#[test]
562566
fn get_window_size() {
563-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
567+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
564568
display.tui.set_size(Size::new(12, 10));
565569
assert_eq!(display.get_window_size(), Size::new(12, 10));
566570
}
567571

568572
#[test]
569573
fn ensure_at_line_start() {
570-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
574+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
571575
display.ensure_at_line_start().unwrap();
572576
assert_eq!(display.tui.get_position(), (0, 0));
573577
}
574578

575579
#[test]
576580
fn move_from_end_of_line() {
577-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
581+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
578582
display.tui.set_size(Size::new(20, 10));
579583
display.move_from_end_of_line(5).unwrap();
580584
// character after the 15th character (0-indexed)
@@ -583,14 +587,14 @@ mod tests {
583587

584588
#[test]
585589
fn start() {
586-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
590+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
587591
display.start().unwrap();
588592
assert_eq!(display.tui.get_state(), mocks::CrosstermMockState::Normal);
589593
}
590594

591595
#[test]
592596
fn end() {
593-
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
597+
let mut display = Display::new(mocks::CrossTerm::new(), &create_theme());
594598
display.end().unwrap();
595599
assert_eq!(display.tui.get_state(), mocks::CrosstermMockState::Ended);
596600
}

‎src/input/key_bindings.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,6 @@ mod tests {
162162
use super::*;
163163
use crate::input::KeyEvent;
164164

165-
#[test]
166-
fn new() {
167-
let _key_bindings = KeyBindings::new(&crate::config::KeyBindings::new());
168-
}
169-
170165
#[test]
171166
fn map_keybindings_with_modifiers() {
172167
assert_eq!(map_keybindings(&[String::from("ControlAltShiftUp")]), vec![Event::Key(

‎src/view/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22
use crate::{config::Theme, display::Size, test_helpers::mocks};
33

44
fn assert_render(width: usize, height: usize, view_data: &ViewData, expected: &[&str]) {
5-
let theme = Theme::new();
5+
let theme = Theme::new_with_config(None).unwrap();
66
let mut crossterm = mocks::CrossTerm::new();
77
let readonly_tui = crossterm.clone();
88
crossterm.set_size(Size::new(width, height));

‎src/view/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ mod tests {
176176

177177
fn with_view<C, CT: mocks::MockableTui>(tui: CT, callback: C)
178178
where C: FnOnce(View<CT>) {
179-
let theme = Theme::new();
179+
let theme = Theme::new_with_config(None).unwrap();
180180
let display = Display::new(tui, &theme);
181181
callback(View::new(display, "~", "?"));
182182
}

0 commit comments

Comments
 (0)