refactor(toml): move git and patch conflict to separate match arm

Author: weihanglo

src/cargo/util/toml/mod.rs

@@ -1910,15 +1910,14 @@ fn resolve_source_id_from_dependency<P: ResolveToPath + Clone>(
                  Only one of `registry` or `registry-index` is allowed.",
             name_in_toml
         ),
-        (Some(git), maybe_path, _, _) => {
-            if maybe_path.is_some() {
-                bail!(
-                    "dependency ({}) specification is ambiguous. \
-                         Only one of `git` or `path` is allowed.",
-                    name_in_toml
-                );
-            }
-
+        (Some(_git), Some(_path), _, _) => {
+            bail!(
+                "dependency ({}) specification is ambiguous. \
+                     Only one of `git` or `path` is allowed.",
+                name_in_toml
+            );
+        }
+        (Some(git), None, _, _) => {
             let n_details = [&orig.branch, &orig.tag, &orig.rev]
                 .iter()
                 .filter(|d| d.is_some())