This commit is contained in:
Graham Christensen 2019-04-13 21:01:18 -04:00
parent 9ada5c239a
commit a7a4152c15
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
7 changed files with 37 additions and 192 deletions

33
ofborg/Cargo.lock generated
View file

@ -47,14 +47,6 @@ name = "antidote"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "arrayvec"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "autocfg"
version = "0.1.1"
@ -407,11 +399,6 @@ dependencies = [
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "nodrop"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "nom"
version = "4.1.1"
@ -420,15 +407,6 @@ dependencies = [
"memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num-format"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num-integer"
version = "0.1.39"
@ -474,7 +452,7 @@ dependencies = [
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"md5 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num-format 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"separator 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
@ -659,6 +637,11 @@ dependencies = [
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "separator"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde"
version = "1.0.84"
@ -873,7 +856,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum amq-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "66d79639b71f74c7006c12683cc2ff221615a51a741688fa7798ccd080dc54d3"
"checksum amqp 0.1.0 (git+https://github.com/grahamc/rust-amqp.git)" = "<none>"
"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
@ -920,9 +902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
"checksum num-format 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465"
"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
@ -948,6 +928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
"checksum separator 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
"checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b"
"checksum serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "bdf540260cfee6da923831f4776ddc495ada940c30117977c70f1313a6130545"

View file

@ -123,7 +123,7 @@ let crates = cratesIO // rec {
(cratesIO.crates."lru_cache"."${deps."ofborg"."0.1.8"."lru_cache"}" deps)
(cratesIO.crates."md5"."${deps."ofborg"."0.1.8"."md5"}" deps)
(cratesIO.crates."nom"."${deps."ofborg"."0.1.8"."nom"}" deps)
(cratesIO.crates."num_format"."${deps."ofborg"."0.1.8"."num_format"}" deps)
(cratesIO.crates."separator"."${deps."ofborg"."0.1.8"."separator"}" deps)
(cratesIO.crates."serde"."${deps."ofborg"."0.1.8"."serde"}" deps)
(cratesIO.crates."serde_derive"."${deps."ofborg"."0.1.8"."serde_derive"}" deps)
(cratesIO.crates."serde_json"."${deps."ofborg"."0.1.8"."serde_json"}" deps)
@ -145,8 +145,8 @@ let crates = cratesIO // rec {
lru_cache."${deps.ofborg."0.1.8".lru_cache}".default = true;
md5."${deps.ofborg."0.1.8".md5}".default = true;
nom."${deps.ofborg."0.1.8".nom}".default = true;
num_format."${deps.ofborg."0.1.8".num_format}".default = true;
ofborg."0.1.8".default = (f.ofborg."0.1.8".default or true);
separator."${deps.ofborg."0.1.8".separator}".default = true;
serde."${deps.ofborg."0.1.8".serde}".default = true;
serde_derive."${deps.ofborg."0.1.8".serde_derive}".default = true;
serde_json."${deps.ofborg."0.1.8".serde_json}".default = true;
@ -169,7 +169,7 @@ let crates = cratesIO // rec {
(cratesIO.features_.lru_cache."${deps."ofborg"."0.1.8"."lru_cache"}" deps)
(cratesIO.features_.md5."${deps."ofborg"."0.1.8"."md5"}" deps)
(cratesIO.features_.nom."${deps."ofborg"."0.1.8"."nom"}" deps)
(cratesIO.features_.num_format."${deps."ofborg"."0.1.8"."num_format"}" deps)
(cratesIO.features_.separator."${deps."ofborg"."0.1.8"."separator"}" deps)
(cratesIO.features_.serde."${deps."ofborg"."0.1.8"."serde"}" deps)
(cratesIO.features_.serde_derive."${deps."ofborg"."0.1.8"."serde_derive"}" deps)
(cratesIO.features_.serde_json."${deps."ofborg"."0.1.8"."serde_json"}" deps)
@ -209,9 +209,6 @@ rec {
url = "1.7.2";
};
deps.antidote."1.0.0" = {};
deps.arrayvec."0.4.10" = {
nodrop = "0.1.13";
};
deps.autocfg."0.1.1" = {};
deps.backtrace."0.3.13" = {
cfg_if = "0.1.6";
@ -355,14 +352,9 @@ rec {
openssl = "0.9.24";
schannel = "0.1.14";
};
deps.nodrop."0.1.13" = {};
deps.nom."4.1.1" = {
memchr = "2.1.2";
};
deps.num_format."0.4.0" = {
arrayvec = "0.4.10";
itoa = "0.4.3";
};
deps.num_integer."0.1.39" = {
num_traits = "0.2.6";
};
@ -386,7 +378,7 @@ rec {
lru_cache = "0.1.1";
md5 = "0.3.8";
nom = "4.1.1";
num_format = "0.4.0";
separator = "0.4.1";
serde = "1.0.84";
serde_derive = "1.0.84";
serde_json = "1.0.34";
@ -471,6 +463,7 @@ rec {
core_foundation_sys = "0.2.3";
libc = "0.2.46";
};
deps.separator."0.4.1" = {};
deps.serde."1.0.84" = {};
deps.serde_derive."1.0.84" = {
proc_macro2 = "0.4.24";

View file

@ -27,7 +27,7 @@ lru-cache = "0.1.1"
nom = "4.0.0-beta3"
sys-info = "0.5.6"
chrono = "0.4.6"
num-format = "0.4.0"
separator = "0.4.1"
[patch.crates-io]
#hubcaps = { path = "../hubcaps" }

View file

@ -2,7 +2,6 @@ aho-corasick-0.5.3
aho-corasick-0.6.9
amq-proto-0.1.0
antidote-1.0.0
arrayvec-0.4.10
autocfg-0.1.1
backtrace-0.3.13
backtrace-sys-0.1.28
@ -48,9 +47,7 @@ memchr-0.1.11
memchr-2.1.2
mime-0.2.6
native-tls-0.1.5
nodrop-0.1.13
nom-4.1.1
num-format-0.4.0
num-integer-0.1.39
num-traits-0.1.43
num-traits-0.2.6
@ -76,6 +73,7 @@ safemem-0.3.0
schannel-0.1.14
security-framework-0.1.16
security-framework-sys-0.1.16
separator-0.4.1
serde-1.0.84
serde_derive-1.0.84
serde_json-1.0.34

View file

@ -99,37 +99,6 @@ rec {
}) [];
# end
# arrayvec-0.4.10
crates.arrayvec."0.4.10" = deps: { features?(features_.arrayvec."0.4.10" deps {}) }: buildRustCrate {
crateName = "arrayvec";
version = "0.4.10";
authors = [ "bluss" ];
sha256 = "0qbh825i59w5wfdysqdkiwbwkrsy7lgbd4pwbyb8pxx8wc36iny8";
dependencies = mapFeatures features ([
(crates."nodrop"."${deps."arrayvec"."0.4.10"."nodrop"}" deps)
]);
features = mkFeatures (features."arrayvec"."0.4.10" or {});
};
features_.arrayvec."0.4.10" = deps: f: updateFeatures f (rec {
arrayvec = fold recursiveUpdate {} [
{ "0.4.10".default = (f.arrayvec."0.4.10".default or true); }
{ "0.4.10".serde =
(f.arrayvec."0.4.10".serde or false) ||
(f.arrayvec."0.4.10".serde-1 or false) ||
(arrayvec."0.4.10"."serde-1" or false); }
{ "0.4.10".std =
(f.arrayvec."0.4.10".std or false) ||
(f.arrayvec."0.4.10".default or false) ||
(arrayvec."0.4.10"."default" or false); }
];
nodrop."${deps.arrayvec."0.4.10".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.10".nodrop}".default or false);
}) [
(features_.nodrop."${deps."arrayvec"."0.4.10"."nodrop"}" deps)
];
# end
# autocfg-0.1.1
@ -1350,33 +1319,6 @@ rec {
];
# end
# nodrop-0.1.13
crates.nodrop."0.1.13" = deps: { features?(features_.nodrop."0.1.13" deps {}) }: buildRustCrate {
crateName = "nodrop";
version = "0.1.13";
authors = [ "bluss" ];
sha256 = "0gkfx6wihr9z0m8nbdhma5pyvbipznjpkzny2d4zkc05b0vnhinb";
dependencies = mapFeatures features ([
]);
features = mkFeatures (features."nodrop"."0.1.13" or {});
};
features_.nodrop."0.1.13" = deps: f: updateFeatures f (rec {
nodrop = fold recursiveUpdate {} [
{ "0.1.13".default = (f.nodrop."0.1.13".default or true); }
{ "0.1.13".nodrop-union =
(f.nodrop."0.1.13".nodrop-union or false) ||
(f.nodrop."0.1.13".use_union or false) ||
(nodrop."0.1.13"."use_union" or false); }
{ "0.1.13".std =
(f.nodrop."0.1.13".std or false) ||
(f.nodrop."0.1.13".default or false) ||
(nodrop."0.1.13"."default" or false); }
];
}) [];
# end
# nom-4.1.1
@ -1428,89 +1370,6 @@ rec {
];
# end
# num-format-0.4.0
crates.num_format."0.4.0" = deps: { features?(features_.num_format."0.4.0" deps {}) }: buildRustCrate {
crateName = "num-format";
version = "0.4.0";
authors = [ "Brian Myers <brian.carl.myers@gmail.com>" ];
sha256 = "0vvvv4bc47h30b6k7m3dzzg9zzsw4g9f84dc2q9sswm51l2hij00";
dependencies = mapFeatures features ([
(crates."arrayvec"."${deps."num_format"."0.4.0"."arrayvec"}" deps)
(crates."itoa"."${deps."num_format"."0.4.0"."itoa"}" deps)
])
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
]) else [])
++ (if kernel == "windows" then mapFeatures features ([
]) else []);
features = mkFeatures (features."num_format"."0.4.0" or {});
};
features_.num_format."0.4.0" = deps: f: updateFeatures f (rec {
arrayvec = fold recursiveUpdate {} [
{ "${deps.num_format."0.4.0".arrayvec}"."default" =
(f.arrayvec."${deps.num_format."0.4.0".arrayvec}"."default" or false) ||
(num_format."0.4.0"."std" or false) ||
(f."num_format"."0.4.0"."std" or false); }
{ "${deps.num_format."0.4.0".arrayvec}"."serde-1" =
(f.arrayvec."${deps.num_format."0.4.0".arrayvec}"."serde-1" or false) ||
(num_format."0.4.0"."with-serde" or false) ||
(f."num_format"."0.4.0"."with-serde" or false); }
{ "${deps.num_format."0.4.0".arrayvec}".default = (f.arrayvec."${deps.num_format."0.4.0".arrayvec}".default or false); }
];
itoa = fold recursiveUpdate {} [
{ "${deps.num_format."0.4.0".itoa}"."default" =
(f.itoa."${deps.num_format."0.4.0".itoa}"."default" or false) ||
(num_format."0.4.0"."std" or false) ||
(f."num_format"."0.4.0"."std" or false); }
{ "${deps.num_format."0.4.0".itoa}"."i128" = true; }
{ "${deps.num_format."0.4.0".itoa}".default = (f.itoa."${deps.num_format."0.4.0".itoa}".default or false); }
];
num_format = fold recursiveUpdate {} [
{ "0.4.0".cfg-if =
(f.num_format."0.4.0".cfg-if or false) ||
(f.num_format."0.4.0".with-system-locale or false) ||
(num_format."0.4.0"."with-system-locale" or false); }
{ "0.4.0".default = (f.num_format."0.4.0".default or true); }
{ "0.4.0".encoding_rs =
(f.num_format."0.4.0".encoding_rs or false) ||
(f.num_format."0.4.0".with-system-locale or false) ||
(num_format."0.4.0"."with-system-locale" or false); }
{ "0.4.0".lazy_static =
(f.num_format."0.4.0".lazy_static or false) ||
(f.num_format."0.4.0".with-system-locale or false) ||
(num_format."0.4.0"."with-system-locale" or false); }
{ "0.4.0".libc =
(f.num_format."0.4.0".libc or false) ||
(f.num_format."0.4.0".with-system-locale or false) ||
(num_format."0.4.0"."with-system-locale" or false); }
{ "0.4.0".num-bigint =
(f.num_format."0.4.0".num-bigint or false) ||
(f.num_format."0.4.0".with-num-bigint or false) ||
(num_format."0.4.0"."with-num-bigint" or false); }
{ "0.4.0".num-format-windows =
(f.num_format."0.4.0".num-format-windows or false) ||
(f.num_format."0.4.0".with-system-locale or false) ||
(num_format."0.4.0"."with-system-locale" or false); }
{ "0.4.0".std =
(f.num_format."0.4.0".std or false) ||
(f.num_format."0.4.0".default or false) ||
(num_format."0.4.0"."default" or false) ||
(f.num_format."0.4.0".with-num-bigint or false) ||
(num_format."0.4.0"."with-num-bigint" or false) ||
(f.num_format."0.4.0".with-system-locale or false) ||
(num_format."0.4.0"."with-system-locale" or false); }
{ "0.4.0".widestring =
(f.num_format."0.4.0".widestring or false) ||
(f.num_format."0.4.0".with-system-locale or false) ||
(num_format."0.4.0"."with-system-locale" or false); }
];
}) [
(features_.arrayvec."${deps."num_format"."0.4.0"."arrayvec"}" deps)
(features_.itoa."${deps."num_format"."0.4.0"."itoa"}" deps)
];
# end
# num-integer-0.1.39
@ -2259,6 +2118,20 @@ rec {
];
# end
# separator-0.4.1
crates.separator."0.4.1" = deps: { features?(features_.separator."0.4.1" deps {}) }: buildRustCrate {
crateName = "separator";
version = "0.4.1";
authors = [ "Saghm Rossi <saghmrossi@gmail.com>" ];
sha256 = "1l7yhf6dy09k9cy0kkwb9wy98rn8mnz72q27wbd6bhiflllwghr7";
};
features_.separator."0.4.1" = deps: f: updateFeatures f (rec {
separator."0.4.1".default = (f.separator."0.4.1".default or true);
}) [];
# end
# serde-1.0.84

View file

@ -27,7 +27,7 @@ extern crate hyper;
extern crate hyper_native_tls;
extern crate lru_cache;
extern crate md5;
extern crate num_format;
extern crate separator;
extern crate tempfile;
extern crate uuid;

View file

@ -1,4 +1,4 @@
use num_format::{Locale, ToFormattedString};
use separator::Separatable;
/// Statistics emitted by Nix when NIX_SHOW_STATS=1
use std::collections::HashMap;
@ -143,10 +143,10 @@ impl<'a> EvaluationStatsDiff<'a> {
}
Row {
before: left.to_formatted_string(&Locale::en),
after: right.to_formatted_string(&Locale::en),
diff: format!("{}{}", direction, diff.to_formatted_string(&Locale::en)),
diff_pct: diff_pct,
before: left.separated_string(),
after: right.separated_string(),
diff: format!("{}{}", direction, diff.separated_string()),
diff_pct,
}
}
@ -169,7 +169,7 @@ impl<'a> EvaluationStatsDiff<'a> {
if diff > 0.0 {
diff_pct = format!(
"{:.2}%",
((right as f64) - (left as f64)) / (left as f64) * 100.0
(f64::from(right) - f64::from(left)) / f64::from(left) * 100.0
);
} else {
diff_pct = String::from("");
@ -179,7 +179,7 @@ impl<'a> EvaluationStatsDiff<'a> {
before: format!("{:.2}", left),
after: format!("{:.2}", right),
diff: format!("{}{:.2}", direction, diff),
diff_pct: diff_pct,
diff_pct,
}
}
}
@ -329,7 +329,7 @@ impl<'a> EvaluationStatsDiff<'a> {
let rows = keys
.into_iter()
.map(|key| {
let row = data.get(&key).unwrap();
let row = &data[&key];
format!("| {key:<keywidth$} | {before:>beforewidth$} | {after:>afterwidth$} | {diff:<diffwidth$} | {diff_pct:>diff_pctwidth$} |",
key=format!("**{}**", key), keywidth=(keylen + 4),
before=row.before, beforewidth=beforelen,