From 5e20a29b4fdc8a2d442d1093681b396dcb4b816b Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Tue, 7 Jan 2020 11:18:04 +0000
Subject: Add structopt dependency in version 0.3.7

This patch series replaces argparse with structopt in the argument
handling code. As a first step, we need structopt as a dependency.

Import subrepo structopt/:structopt at efbdda4753592e27bc430fb01f7b9650b2f3174d
Import subrepo bitflags/:bitflags at 30668016aca6bd3b02c766e8347e0b4080d4c296
Import subrepo clap/:clap at 784524f7eb193e35f81082cc69454c8c21b948f7
Import subrepo heck/:heck at 093d56fbf001e1506e56dbfa38631d99b1066df1
Import subrepo proc-macro-error/:proc-macro-error at 6c4cfe79a622c5de8ae68557993542be46eacae2
Import subrepo proc-macro2/:proc-macro2 at d5d48eddca4566e5438e8a2cbed4a74e049544de
Import subrepo quote/:quote at 727436c6c137b20f0f34dde5d8fda2679b9747ad
Import subrepo rustversion/:rustversion at 0c5663313516263059ce9059ef81fc7a1cf655ca
Import subrepo syn-mid/:syn-mid at 5d3d85414a9e6674e1857ec22a87b96e04a6851a
Import subrepo syn/:syn at e87c27e87f6f4ef8919d0372bdb056d53ef0d8f3
Import subrepo textwrap/:textwrap at abcd618beae3f74841032aa5b53c1086b0a57ca2
Import subrepo unicode-segmentation/:unicode-segmentation at 637c9874c4fe0c205ff27787faf150a40295c6c3
Import subrepo unicode-width/:unicode-width at 3033826f8bf05e82724140a981d5941e48fce393
Import subrepo unicode-xid/:unicode-xid at 4baae9fffb156ba229665b972a9cd5991787ceb7
---
 rustversion/src/bound.rs | 84 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 rustversion/src/bound.rs

(limited to 'rustversion/src/bound.rs')

diff --git a/rustversion/src/bound.rs b/rustversion/src/bound.rs
new file mode 100644
index 0000000..2546637
--- /dev/null
+++ b/rustversion/src/bound.rs
@@ -0,0 +1,84 @@
+use crate::date::Date;
+use crate::version::{Channel::*, Version};
+use quote::quote;
+use std::cmp::Ordering;
+use syn::parse::{Error, Parse, ParseStream, Result};
+use syn::{LitFloat, LitInt, Token};
+
+pub enum Bound {
+    Nightly(Date),
+    Stable(Release),
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Release {
+    pub minor: u16,
+    pub patch: Option<u16>,
+}
+
+impl Parse for Bound {
+    fn parse(input: ParseStream) -> Result<Self> {
+        if input.peek2(Token![-]) {
+            input.parse().map(Bound::Nightly)
+        } else {
+            input.parse().map(Bound::Stable)
+        }
+    }
+}
+
+impl Parse for Release {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let span = input.cursor().token_stream();
+        let error = || Error::new_spanned(&span, "expected rustc release number, like 1.31");
+
+        let major_minor: LitFloat = input.parse().map_err(|_| error())?;
+        let string = quote!(#major_minor).to_string();
+
+        if !string.starts_with("1.") {
+            return Err(error());
+        }
+
+        let minor: u16 = string[2..].parse().map_err(|_| error())?;
+
+        let patch = if input.parse::<Option<Token![.]>>()?.is_some() {
+            let int: LitInt = input.parse().map_err(|_| error())?;
+            Some(int.base10_parse().map_err(|_| error())?)
+        } else {
+            None
+        };
+
+        Ok(Release { minor, patch })
+    }
+}
+
+impl PartialEq<Bound> for Version {
+    fn eq(&self, rhs: &Bound) -> bool {
+        match rhs {
+            Bound::Nightly(date) => match self.channel {
+                Stable | Beta | Dev => false,
+                Nightly(nightly) => nightly == *date,
+            },
+            Bound::Stable(release) => {
+                self.minor == release.minor
+                    && release.patch.map_or(true, |patch| self.patch == patch)
+            }
+        }
+    }
+}
+
+impl PartialOrd<Bound> for Version {
+    fn partial_cmp(&self, rhs: &Bound) -> Option<Ordering> {
+        match rhs {
+            Bound::Nightly(date) => match self.channel {
+                Stable | Beta => Some(Ordering::Less),
+                Nightly(nightly) => Some(nightly.cmp(date)),
+                Dev => Some(Ordering::Greater),
+            },
+            Bound::Stable(release) => {
+                let version = (self.minor, self.patch);
+                let bound = (release.minor, release.patch.unwrap_or(0));
+                Some(version.cmp(&bound))
+            }
+        }
+    }
+}
-- 
cgit v1.2.1