Auto merge of #212 - JohnTitor:bump-cargo-and-semver, r=Xanewok

Upgrade the `cargo` and `semver` crates

r? `@Xanewok`

Author: bors

Cargo.lock

@@ -11,13 +11,13 @@ license-file = "LICENSE"
 edition = "2018"
 
 [dependencies]
-cargo = "0.54"
+cargo = "0.55"
 crates-io = "0.33" # Keep in sync with version pulled by Cargo
 curl = "0.4.38"
 env_logger = "0.9"
 anyhow = "1.0.42"
 log = "0.4"
-semver = "0.10" # Keep in sync with version pulled by Cargo
+semver = "1.0" # Keep in sync with version pulled by Cargo
 serde = { version = "1.0.127", features = ["derive"] }
 serde_json = "1.0.66"
 

Cargo.toml

@@ -14,7 +14,7 @@ use rustc_middle::ty::{error::TypeError, Predicate};
 use rustc_session::Session;
 use rustc_span::symbol::Symbol;
 use rustc_span::{FileName, Span};
-use semver::Version;
+use semver::{BuildMetadata, Prerelease, Version};
 use std::{
     cmp::Ordering,
     collections::{BTreeMap, BTreeSet, HashMap},
@@ -1088,12 +1088,12 @@ impl<'tcx> ChangeSet<'tcx> {
     fn get_new_version(&self, version: &str) -> Option<String> {
         if let Ok(mut new_version) = Version::parse(version) {
             if new_version.major == 0 {
-                new_version.increment_patch();
+                increment_patch(&mut new_version);
             } else {
                 match self.max {
-                    Patch => new_version.increment_patch(),
-                    NonBreaking | TechnicallyBreaking => new_version.increment_minor(),
-                    Breaking => new_version.increment_major(),
+                    Patch => increment_patch(&mut new_version),
+                    NonBreaking | TechnicallyBreaking => increment_minor(&mut new_version),
+                    Breaking => increment_major(&mut new_version),
                 }
             }
 
@@ -1700,3 +1700,24 @@ pub mod tests {
         }
     }
 }
+
+fn increment_patch(v: &mut Version) {
+    v.patch += 1;
+    v.pre = Prerelease::EMPTY;
+    v.build = BuildMetadata::EMPTY;
+}
+
+fn increment_minor(v: &mut Version) {
+    v.minor += 1;
+    v.patch = 0;
+    v.pre = Prerelease::EMPTY;
+    v.build = BuildMetadata::EMPTY;
+}
+
+fn increment_major(v: &mut Version) {
+    v.major += 1;
+    v.minor = 0;
+    v.patch = 0;
+    v.pre = Prerelease::EMPTY;
+    v.build = BuildMetadata::EMPTY;
+}