Skip to content

Commit 8a3a82b

Browse files
committed
refactor: patchedit imports
1 parent af4dedc commit 8a3a82b

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

src/patchedit/description.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ use anyhow::{anyhow, Context, Result};
88

99
use crate::{ext::TimeExtended, patchname::PatchName};
1010

11-
use super::parse::parse_name_email;
12-
1311
#[derive(Clone, PartialEq, Eq)]
1412
pub(super) struct DiffBuffer(pub(super) Vec<u8>);
1513

@@ -249,7 +247,7 @@ impl TryFrom<&[u8]> for EditedPatchDescription {
249247

250248
let author = if let Some(maybe_author) = raw_author {
251249
Some(if let Some(name_email) = maybe_author {
252-
let (name, email) = parse_name_email(&name_email)?;
250+
let (name, email) = super::parse::parse_name_email(&name_email)?;
253251
if let Some(Some(date_str)) = raw_authdate {
254252
let when =
255253
git2::Time::parse_time(&date_str).context("patch description date")?;

src/patchedit/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ use clap::{
2323
builder::{self, ValueParser},
2424
Arg, ArgMatches, ValueHint,
2525
};
26-
use description::{DiffBuffer, EditablePatchDescription, EditedPatchDescription};
27-
pub(crate) use interactive::call_editor;
28-
use interactive::edit_interactive;
29-
pub(crate) use parse::parse_name_email;
3026

27+
use self::{
28+
description::{DiffBuffer, EditablePatchDescription, EditedPatchDescription},
29+
interactive::edit_interactive,
30+
parse::{parse_email, parse_name, parse_name_email2},
31+
};
32+
pub(crate) use self::{interactive::call_editor, parse::parse_name_email};
3133
use crate::{
3234
argset,
3335
ext::{CommitExtended, RepositoryExtended, SignatureExtended, TimeExtended},
@@ -37,8 +39,6 @@ use crate::{
3739
wrap::Message,
3840
};
3941

40-
use self::parse::{parse_email, parse_name, parse_name_email2};
41-
4242
/// Add patch editing options to a StGit command.
4343
pub(crate) fn add_args(
4444
command: clap::Command,

0 commit comments

Comments
 (0)