Commit e5d3e65b authored by Ben Boeckel's avatar Ben Boeckel

rustfmt: move operators to the front

parent 9ae0df0a
...@@ -45,10 +45,10 @@ impl Conflict { ...@@ -45,10 +45,10 @@ impl Conflict {
/// The path to the blob that for the conflict. /// The path to the blob that for the conflict.
pub fn path(&self) -> &Path { pub fn path(&self) -> &Path {
match *self { match *self {
Conflict::Path(ref p) | Conflict::Path(ref p)
Conflict::SubmoduleNotMerged(ref p) | | Conflict::SubmoduleNotMerged(ref p)
Conflict::SubmoduleNotPresent(ref p) | | Conflict::SubmoduleNotPresent(ref p)
Conflict::SubmoduleWithFix(ref p, _) => p, | Conflict::SubmoduleWithFix(ref p, _) => p,
} }
} }
} }
......
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