Reformat the source code
This commit is contained in:
@@ -16,21 +16,21 @@
|
||||
|
||||
//! Parity version specific information.
|
||||
|
||||
extern crate target_info;
|
||||
extern crate parity_bytes as bytes;
|
||||
extern crate rlp;
|
||||
extern crate target_info;
|
||||
|
||||
use target_info::Target;
|
||||
use bytes::Bytes;
|
||||
use rlp::RlpStream;
|
||||
use target_info::Target;
|
||||
|
||||
mod vergen {
|
||||
#![allow(unused)]
|
||||
include!(concat!(env!("OUT_DIR"), "/version.rs"));
|
||||
#![allow(unused)]
|
||||
include!(concat!(env!("OUT_DIR"), "/version.rs"));
|
||||
}
|
||||
|
||||
mod generated {
|
||||
include!(concat!(env!("OUT_DIR"), "/meta.rs"));
|
||||
include!(concat!(env!("OUT_DIR"), "/meta.rs"));
|
||||
}
|
||||
|
||||
#[cfg(feature = "final")]
|
||||
@@ -43,35 +43,52 @@ const THIS_TRACK: &'static str = "unstable";
|
||||
|
||||
/// Get the platform identifier.
|
||||
pub fn platform() -> String {
|
||||
let env = Target::env();
|
||||
let env_dash = if env.is_empty() { "" } else { "-" };
|
||||
format!("{}-{}{}{}", Target::arch(), Target::os(), env_dash, env)
|
||||
let env = Target::env();
|
||||
let env_dash = if env.is_empty() { "" } else { "-" };
|
||||
format!("{}-{}{}{}", Target::arch(), Target::os(), env_dash, env)
|
||||
}
|
||||
|
||||
/// Get the standard version string for this software.
|
||||
pub fn version() -> String {
|
||||
let sha3 = vergen::short_sha();
|
||||
let sha3_dash = if sha3.is_empty() { "" } else { "-" };
|
||||
let commit_date = vergen::commit_date().replace("-", "");
|
||||
let date_dash = if commit_date.is_empty() { "" } else { "-" };
|
||||
format!("Parity-Ethereum/v{}-{}{}{}{}{}/{}/rustc{}", env!("CARGO_PKG_VERSION"), THIS_TRACK, sha3_dash, sha3, date_dash, commit_date, platform(), generated::rustc_version())
|
||||
let sha3 = vergen::short_sha();
|
||||
let sha3_dash = if sha3.is_empty() { "" } else { "-" };
|
||||
let commit_date = vergen::commit_date().replace("-", "");
|
||||
let date_dash = if commit_date.is_empty() { "" } else { "-" };
|
||||
format!(
|
||||
"Parity-Ethereum/v{}-{}{}{}{}{}/{}/rustc{}",
|
||||
env!("CARGO_PKG_VERSION"),
|
||||
THIS_TRACK,
|
||||
sha3_dash,
|
||||
sha3,
|
||||
date_dash,
|
||||
commit_date,
|
||||
platform(),
|
||||
generated::rustc_version()
|
||||
)
|
||||
}
|
||||
|
||||
/// Get the standard version data for this software.
|
||||
pub fn version_data() -> Bytes {
|
||||
let mut s = RlpStream::new_list(4);
|
||||
let v =
|
||||
(env!("CARGO_PKG_VERSION_MAJOR").parse::<u32>().expect("Environment variables are known to be valid; qed") << 16) +
|
||||
(env!("CARGO_PKG_VERSION_MINOR").parse::<u32>().expect("Environment variables are known to be valid; qed") << 8) +
|
||||
env!("CARGO_PKG_VERSION_PATCH").parse::<u32>().expect("Environment variables are known to be valid; qed");
|
||||
s.append(&v);
|
||||
s.append(&"Parity-Ethereum");
|
||||
s.append(&generated::rustc_version());
|
||||
s.append(&&Target::os()[0..2]);
|
||||
s.out()
|
||||
let mut s = RlpStream::new_list(4);
|
||||
let v = (env!("CARGO_PKG_VERSION_MAJOR")
|
||||
.parse::<u32>()
|
||||
.expect("Environment variables are known to be valid; qed")
|
||||
<< 16)
|
||||
+ (env!("CARGO_PKG_VERSION_MINOR")
|
||||
.parse::<u32>()
|
||||
.expect("Environment variables are known to be valid; qed")
|
||||
<< 8)
|
||||
+ env!("CARGO_PKG_VERSION_PATCH")
|
||||
.parse::<u32>()
|
||||
.expect("Environment variables are known to be valid; qed");
|
||||
s.append(&v);
|
||||
s.append(&"Parity-Ethereum");
|
||||
s.append(&generated::rustc_version());
|
||||
s.append(&&Target::os()[0..2]);
|
||||
s.out()
|
||||
}
|
||||
|
||||
/// Provide raw information on the package.
|
||||
pub fn raw_package_info() -> (&'static str, &'static str, &'static str) {
|
||||
(THIS_TRACK, env!["CARGO_PKG_VERSION"], vergen::sha())
|
||||
(THIS_TRACK, env!["CARGO_PKG_VERSION"], vergen::sha())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user