Add all other rustc_version fields

.gitignore

@@ -1 +1,2 @@
-/target
+target
+Cargo.lock

versionator-common/Cargo.toml

@@ -8,3 +8,8 @@ edition = "2018"
 
 [dependencies]
 derive-new = "0.5"
+semver = { version = "0.9", optional = true }
+
+[features]
+default = ["with-semver"]
+with-semver = ["semver"]

versionator-common/src/lib.rs

@@ -1,15 +1,27 @@
+pub use semver::Version;
+
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
-pub struct Version<'a> {
+pub struct BuildInfo<'a> {
 	pub compiler: CompilerVersion<'a>,
 }
 
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
 pub struct CompilerVersion<'a> {
+	pub version_str: &'a str,
+	pub commit_hash: Option<&'a str>,
+	pub commit_date: Option<&'a str>,
 	pub channel: CompilerChannel,
 	pub host_triple: &'a str,
 	pub target_triple: &'a str,
 }
 
+#[cfg(feature = "semver")]
+impl<'a> CompilerVersion<'a> {
+	pub fn version(&self) -> Version {
+		Version::parse(self.version_str).unwrap()
+	}
+}
+
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
 pub enum CompilerChannel {
 	Dev,

versionator-proc/src/lib.rs

@@ -7,6 +7,20 @@ fn compiler_version() -> proc_macro2::TokenStream {
 
 	let version = version_meta().unwrap();
 
+	let semver = version.semver.to_string();
+
+	let commit_hash = if let Some(commit_hash) = version.commit_hash {
+		quote!(Some(#commit_hash))
+	} else {
+		quote!(None)
+	};
+
+	let commit_date = if let Some(commit_date) = version.commit_date {
+		quote!(Some(#commit_date))
+	} else {
+		quote!(None)
+	};
+
 	let channel = match version.channel {
 		Channel::Stable => quote!(versionator::CompilerChannel::Stable),
 		Channel::Beta => quote!(versionator::CompilerChannel::Beta),
@@ -18,6 +32,9 @@ fn compiler_version() -> proc_macro2::TokenStream {
 	let target_triple = env!("TARGET_TRIPLE");
 
 	quote!(versionator::CompilerVersion{
+		version_str: #semver,
+		commit_hash: #commit_hash,
+		commit_date: #commit_date,
 		channel: #channel,
 		host_triple: #host_triple,
 		target_triple: #target_triple,
@@ -30,11 +47,11 @@ pub fn versionator(id: TokenStream) -> TokenStream {
 	let compiler_version = compiler_version();
 
 	let output = quote!(
-		static #id: versionator::Version = versionator::Version{
+		static #id: versionator::BuildInfo = versionator::BuildInfo{
 			compiler: #compiler_version
 		};
 	);
 
-	// println!("{:?}", output.to_string());
+	println!("{}", output.to_string());
 	output.into()
 }