Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Ben Boeckel
rust-git-workarea
Commits
a1a1902d
Commit
a1a1902d
authored
Oct 09, 2019
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imports: sort std -> crates -> internals
parent
621064a5
Pipeline
#148209
passed with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
src/git.rs
src/git.rs
+2
-2
src/prepare.rs
src/prepare.rs
+6
-6
src/test.rs
src/test.rs
+6
-6
No files found.
src/git.rs
View file @
a1a1902d
...
...
@@ -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
);
...
...
src/prepare.rs
View file @
a1a1902d
...
...
@@ -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]
...
...
src/test.rs
View file @
a1a1902d
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment