Commit a1a1902d authored by Ben Boeckel's avatar Ben Boeckel

imports: sort std -> crates -> internals

parent 621064a5
Pipeline #148209 passed with stage
......@@ -6,8 +6,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use prepare::{GitWorkArea, WorkAreaResult};
use std::borrow::Cow;
use std::error::Error;
use std::ffi::OsStr;
......@@ -16,6 +14,8 @@ use std::io;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use prepare::{GitWorkArea, WorkAreaResult};
/// The Git object id of a commit.
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct CommitId(String);
......
......@@ -6,12 +6,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use crates::chrono::{DateTime, Utc};
use crates::regex::Regex;
use crates::tempdir::TempDir;
use git::{CommitId, GitContext, GitError, GitResult, Identity};
use std::borrow::Cow;
use std::collections::hash_map::HashMap;
use std::error::Error;
......@@ -24,6 +18,12 @@ use std::marker::PhantomData;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use crates::chrono::{DateTime, Utc};
use crates::regex::Regex;
use crates::tempdir::TempDir;
use git::{CommitId, GitContext, GitError, GitResult, Identity};
/// Steps which are involved in the submodule preparation process.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
// TODO: #[non_exhaustive]
......
......@@ -6,18 +6,18 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use crates::itertools::Itertools;
use crates::log::{self, Level, LevelFilter, Log, Metadata, Record};
use crates::tempdir::TempDir;
use {CommitId, Conflict, GitContext, GitWorkArea, MergeResult, MergeStatus};
use std::env;
use std::fs;
use std::iter;
use std::path::Path;
use std::process::{Command, Stdio};
use crates::itertools::Itertools;
use crates::log::{self, Level, LevelFilter, Log, Metadata, Record};
use crates::tempdir::TempDir;
use {CommitId, Conflict, GitContext, GitWorkArea, MergeResult, MergeStatus};
fn setup_logging() {
struct SimpleLogger;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment