Remove parsing of broken version syntax from 5 years ago

Author: dtolnay

crates/resolver-tests/src/lib.rs

@@ -506,7 +506,7 @@ pub trait ToDep {
 
 impl ToDep for &'static str {
     fn to_dep(self) -> Dependency {
-        Dependency::parse_no_deprecated(self, Some("1.0.0"), registry_loc()).unwrap()
+        Dependency::parse(self, Some("1.0.0"), registry_loc()).unwrap()
     }
 }
 
@@ -626,7 +626,7 @@ pub fn dep(name: &str) -> Dependency {
     dep_req(name, "*")
 }
 pub fn dep_req(name: &str, req: &str) -> Dependency {
-    Dependency::parse_no_deprecated(name, Some(req), registry_loc()).unwrap()
+    Dependency::parse(name, Some(req), registry_loc()).unwrap()
 }
 pub fn dep_req_kind(name: &str, req: &str, kind: DepKind, public: bool) -> Dependency {
     let mut dep = dep_req(name, req);
@@ -639,7 +639,7 @@ pub fn dep_loc(name: &str, location: &str) -> Dependency {
     let url = location.into_url().unwrap();
     let master = GitReference::Branch("master".to_string());
     let source_id = SourceId::for_git(&url, master).unwrap();
-    Dependency::parse_no_deprecated(name, Some("1.0.0"), source_id).unwrap()
+    Dependency::parse(name, Some("1.0.0"), source_id).unwrap()
 }
 pub fn dep_kind(name: &str, kind: DepKind) -> Dependency {
     dep(name).set_kind(kind).clone()

src/cargo/core/compiler/standard_lib.rs

@@ -47,7 +47,7 @@ pub fn resolve_std<'cfg>(
         .iter()
         .map(|&name| {
             let source_path = SourceId::for_path(&src_path.join("library").join(name))?;
-            let dep = Dependency::parse_no_deprecated(name, None, source_path)?;
+            let dep = Dependency::parse(name, None, source_path)?;
             Ok(dep)
         })
         .collect::<CargoResult<Vec<_>>>()?;

src/cargo/core/dependency.rs

@@ -9,7 +9,7 @@ use std::rc::Rc;
 use crate::core::{PackageId, SourceId, Summary};
 use crate::util::errors::CargoResult;
 use crate::util::interning::InternedString;
-use crate::util::{Config, OptVersionReq};
+use crate::util::OptVersionReq;
 
 /// Information about a dependency requested by a Cargo manifest.
 /// Cheap to copy.
@@ -97,58 +97,6 @@ pub enum DepKind {
     Build,
 }
 
-fn parse_req_with_deprecated(
-    name: InternedString,
-    req: &str,
-    extra: Option<(PackageId, &Config)>,
-) -> CargoResult<VersionReq> {
-    let err = match VersionReq::parse(req) {
-        Ok(req) => return Ok(req),
-        Err(err) => err,
-    };
-
-    let (inside, config) = match extra {
-        Some(pair) => pair,
-        None => return Err(err.into()),
-    };
-
-    let corrected = match req {
-        ".*" => "*",
-        "0.1.0." => "0.1.0",
-        "0.3.1.3" => "0.3.13",
-        "0.2*" => "0.2.*",
-        "*.0" => "*",
-        _ => {
-            return Err(anyhow::Error::new(err).context(format!(
-                "failed to parse the version requirement `{}` for dependency `{}`",
-                req, name,
-            )));
-        }
-    };
-
-    let msg = format!(
-        "\
-parsed version requirement `{}` is no longer valid
-
-Previous versions of Cargo accepted this malformed requirement,
-but it is being deprecated. This was found when parsing the manifest
-of {} {}, and the correct version requirement is `{}`.
-
-This will soon become a hard error, so it's either recommended to
-update to a fixed version or contact the upstream maintainer about
-this warning.
-",
-        req,
-        inside.name(),
-        inside.version(),
-        corrected,
-    );
-
-    config.shell().warn(&msg)?;
-
-    Ok(VersionReq::parse(corrected).unwrap())
-}
-
 impl ser::Serialize for DepKind {
     fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
     where
@@ -169,35 +117,18 @@ impl Dependency {
         name: impl Into<InternedString>,
         version: Option<&str>,
         source_id: SourceId,
-        inside: PackageId,
-        config: &Config,
-    ) -> CargoResult<Dependency> {
-        let name = name.into();
-        let arg = Some((inside, config));
-        let (specified_req, version_req) = match version {
-            Some(v) => (true, parse_req_with_deprecated(name, v, arg)?.into()),
-            None => (false, OptVersionReq::Any),
-        };
-
-        let mut ret = Dependency::new_override(name, source_id);
-        {
-            let ptr = Rc::make_mut(&mut ret.inner);
-            ptr.only_match_name = false;
-            ptr.req = version_req;
-            ptr.specified_req = specified_req;
-        }
-        Ok(ret)
-    }
-
-    /// Attempt to create a `Dependency` from an entry in the manifest.
-    pub fn parse_no_deprecated(
-        name: impl Into<InternedString>,
-        version: Option<&str>,
-        source_id: SourceId,
     ) -> CargoResult<Dependency> {
         let name = name.into();
         let (specified_req, version_req) = match version {
-            Some(v) => (true, parse_req_with_deprecated(name, v, None)?.into()),
+            Some(v) => match VersionReq::parse(v) {
+                Ok(req) => (true, OptVersionReq::Req(req)),
+                Err(err) => {
+                    return Err(anyhow::Error::new(err).context(format!(
+                        "failed to parse the version requirement `{}` for dependency `{}`",
+                        v, name,
+                    )))
+                }
+            },
             None => (false, OptVersionReq::Any),
         };
 

src/cargo/core/workspace.rs

@@ -396,7 +396,6 @@ impl<'cfg> Workspace<'cfg> {
                     .map(|(name, dep)| {
                         dep.to_dependency_split(
                             name,
-                            /* pkg_id */ None,
                             source,
                             &mut nested_paths,
                             self.config,

src/cargo/ops/cargo_install.rs

@@ -180,11 +180,7 @@ fn install_one(
                 } else {
                     None
                 };
-                Some(Dependency::parse_no_deprecated(
-                    krate,
-                    vers.as_deref(),
-                    source_id,
-                )?)
+                Some(Dependency::parse(krate, vers.as_deref(), source_id)?)
             } else {
                 None
             }

src/cargo/sources/registry/mod.rs

@@ -373,7 +373,7 @@ impl<'a> RegistryDependency<'a> {
             default
         };
 
-        let mut dep = Dependency::parse_no_deprecated(package.unwrap_or(name), Some(&req), id)?;
+        let mut dep = Dependency::parse(package.unwrap_or(name), Some(&req), id)?;
         if package.is_some() {
             dep.set_explicit_name_in_toml(name);
         }

src/cargo/util/toml/mod.rs

@@ -874,7 +874,6 @@ impl TomlProject {
 }
 
 struct Context<'a, 'b> {
-    pkgid: Option<PackageId>,
     deps: &'a mut Vec<Dependency>,
     source_id: SourceId,
     nested_paths: &'a mut Vec<PathBuf>,
@@ -1189,7 +1188,6 @@ impl TomlManifest {
 
         {
             let mut cx = Context {
-                pkgid: Some(pkgid),
                 deps: &mut deps,
                 source_id,
                 nested_paths: &mut nested_paths,
@@ -1457,7 +1455,6 @@ impl TomlManifest {
 
         let (replace, patch) = {
             let mut cx = Context {
-                pkgid: None,
                 deps: &mut deps,
                 source_id,
                 nested_paths: &mut nested_paths,
@@ -1653,7 +1650,6 @@ impl<P: ResolveToPath> TomlDependency<P> {
     pub(crate) fn to_dependency_split(
         &self,
         name: &str,
-        pkgid: Option<PackageId>,
         source_id: SourceId,
         nested_paths: &mut Vec<PathBuf>,
         config: &Config,
@@ -1666,7 +1662,6 @@ impl<P: ResolveToPath> TomlDependency<P> {
         self.to_dependency(
             name,
             &mut Context {
-                pkgid,
                 deps: &mut Vec::new(),
                 source_id,
                 nested_paths,
@@ -1875,10 +1870,7 @@ impl<P: ResolveToPath> DetailedTomlDependency<P> {
         };
 
         let version = self.version.as_deref();
-        let mut dep = match cx.pkgid {
-            Some(id) => Dependency::parse(pkg_name, version, new_source_id, id, cx.config)?,
-            None => Dependency::parse_no_deprecated(pkg_name, version, new_source_id)?,
-        };
+        let mut dep = Dependency::parse(pkg_name, version, new_source_id)?;
         dep.set_features(self.features.iter().flatten())
             .set_default_features(
                 self.default_features

tests/testsuite/registry.rs

@@ -1695,119 +1695,6 @@ fn bump_version_dont_update_registry() {
         .run();
 }
 
-#[cargo_test]
-fn old_version_req() {
-    let p = project()
-        .file(
-            "Cargo.toml",
-            r#"
-                [project]
-                name = "bar"
-                version = "0.5.0"
-                authors = []
-
-                [dependencies]
-                remote = "0.2*"
-            "#,
-        )
-        .file("src/main.rs", "fn main() {}")
-        .build();
-
-    Package::new("remote", "0.2.0").publish();
-
-    p.cargo("build")
-        .with_stderr(
-            "\
-warning: parsed version requirement `0.2*` is no longer valid
-
-Previous versions of Cargo accepted this malformed requirement,
-but it is being deprecated. This was found when parsing the manifest
-of bar 0.5.0, and the correct version requirement is `0.2.*`.
-
-This will soon become a hard error, so it's either recommended to
-update to a fixed version or contact the upstream maintainer about
-this warning.
-
-warning: parsed version requirement `0.2*` is no longer valid
-
-Previous versions of Cargo accepted this malformed requirement,
-but it is being deprecated. This was found when parsing the manifest
-of bar 0.5.0, and the correct version requirement is `0.2.*`.
-
-This will soon become a hard error, so it's either recommended to
-update to a fixed version or contact the upstream maintainer about
-this warning.
-
-[UPDATING] [..]
-[DOWNLOADING] crates ...
-[DOWNLOADED] [..]
-[COMPILING] [..]
-[COMPILING] [..]
-[FINISHED] [..]
-",
-        )
-        .run();
-}
-
-#[cargo_test]
-fn old_version_req_upstream() {
-    let p = project()
-        .file(
-            "Cargo.toml",
-            r#"
-                [project]
-                name = "bar"
-                version = "0.5.0"
-                authors = []
-
-                [dependencies]
-                remote = "0.3"
-            "#,
-        )
-        .file("src/main.rs", "fn main() {}")
-        .build();
-
-    Package::new("remote", "0.3.0")
-        .file(
-            "Cargo.toml",
-            r#"
-                [project]
-                name = "remote"
-                version = "0.3.0"
-                authors = []
-
-                [dependencies]
-                bar = "0.2*"
-            "#,
-        )
-        .file("src/lib.rs", "")
-        .publish();
-    Package::new("bar", "0.2.0").publish();
-
-    p.cargo("build")
-        .with_stderr(
-            "\
-[UPDATING] [..]
-[DOWNLOADING] crates ...
-[DOWNLOADED] [..]
-warning: parsed version requirement `0.2*` is no longer valid
-
-Previous versions of Cargo accepted this malformed requirement,
-but it is being deprecated. This was found when parsing the manifest
-of remote 0.3.0, and the correct version requirement is `0.2.*`.
-
-This will soon become a hard error, so it's either recommended to
-update to a fixed version or contact the upstream maintainer about
-this warning.
-
-[COMPILING] [..]
-[COMPILING] [..]
-[FINISHED] [..]
-",
-        )
-        .run();
-}
-
 #[cargo_test]
 fn toml_lies_but_index_is_truth() {
     Package::new("foo", "0.2.0").publish();