From c4e150b25e4ceb5a295309c3f52367a9b265a268 Mon Sep 17 00:00:00 2001 From: mjarkk Date: Mon, 1 Jun 2020 19:41:52 +0200 Subject: [PATCH] Fix review --- src/cargo/util/toml/mod.rs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index b6c0571f4aa..6367a12e410 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -1611,18 +1611,6 @@ impl DetailedTomlDependency { } } - if let Some(git) = self.git.clone() { - if let Ok(url) = git.into_url() { - if url.fragment().is_some() { - let msg = format!( - "hash in git url is ignored for dependency ({}). \ - If you were trying to specify a specific git revision, use rev = \"revision\".", - name_in_toml); - cx.warnings.push(msg) - } - } - } - let new_source_id = match ( self.git.as_ref(), self.path.as_ref(), @@ -1673,6 +1661,17 @@ impl DetailedTomlDependency { .or_else(|| self.rev.clone().map(GitReference::Rev)) .unwrap_or_else(|| GitReference::Branch("master".to_string())); let loc = git.into_url()?; + + if let Some(fragment) = loc.fragment() { + let msg = format!( + "URL fragment `#{}` in git URL is ignored for dependency ({}). \ + If you were trying to specify a specific git revision, \ + use `rev = \"{}\"` in the dependency declaration.", + fragment, name_in_toml, fragment + ); + cx.warnings.push(msg) + } + SourceId::for_git(&loc, reference)? } (None, Some(path), _, _) => {