Merge pull request #124 from Furisto/release

Reduce size of binary

Cargo.lock

@@ -23,17 +23,6 @@ version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -107,14 +96,12 @@ version = "3.0.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
 dependencies = [
- "atty",
  "bitflags",
  "clap_derive",
  "indexmap",
  "lazy_static",
  "os_str_bytes",
  "strsim",
- "termcolor",
  "textwrap",
  "unicode-width",
  "vec_map",
@@ -878,15 +865,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.12.1"
@@ -984,15 +962,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -1018,7 +987,6 @@ dependencies = [
  "prctl",
  "procfs",
  "quickcheck",
- "regex",
  "serde",
  "serde_json",
  "serial_test",

Cargo.toml

@@ -5,8 +5,12 @@ authors = ["utam0k <k0ma@utam0k.jp>"]
 edition = "2018"
 description = "A container runtime written in Rust"
 
+[dependencies.clap]
+version = "3.0.0-beta.2"
+default-features = false
+features = ["std", "suggestions", "derive"]
+
 [dependencies]
-clap = "3.0.0-beta.2"
 nix = "0.19.1"
 procfs = "0.9.1"
 caps = "0.5.1"
@@ -20,7 +24,6 @@ mio = { version = "0.7", features = ["os-ext", "os-poll"] }
 chrono = { version="0.4", features = ["serde"] }
 once_cell = "1.6.0"
 futures = { version = "0.3", features = ["thread-pool"] }
-regex = "1.5"
 oci_spec = { version = "0.1.0", path = "./oci_spec" }
 systemd = { version = "0.8", default-features = false }
 dbus = "0.9.2"
@@ -30,3 +33,6 @@ tabwriter = "1"
 oci_spec = { version = "0.1.0", path = "./oci_spec", features = ["proptests"] }
 quickcheck = "1"
 serial_test = "0.5.1"
+
+[profile.release]
+lto = true

src/cgroups/v1/hugetlb.rs

@@ -1,7 +1,6 @@
 use std::path::Path;
 
 use anyhow::{bail, Result};
-use regex::Regex;
 
 use crate::cgroups::{common, v1::Controller};
 use oci_spec::{LinuxHugepageLimit, LinuxResources};
@@ -34,16 +33,14 @@ impl Controller for Hugetlb {
 
 impl Hugetlb {
     fn apply(root_path: &Path, hugetlb: &LinuxHugepageLimit) -> Result<()> {
-        let re = Regex::new(r"(?P<pagesize>[0-9]+)[KMG]B")?;
-        let caps = re.captures(&hugetlb.page_size);
-        match caps {
-            None => bail!("page size must be in the format [0-9]+[KMG]B"),
-            Some(caps) => {
-                let page_size: u64 = caps["pagesize"].parse()?;
-                if !Self::is_power_of_two(page_size) {
-                    bail!("page size must be in the format of 2^(integer)");
-                }
-            }
+        let page_size: String = hugetlb
+            .page_size
+            .chars()
+            .take_while(|c| c.is_digit(10))
+            .collect();
+        let page_size: u64 = page_size.parse()?;
+        if !Self::is_power_of_two(page_size) {
+            bail!("page size must be in the format of 2^(integer)");
         }
 
         common::write_cgroup_file(
@@ -106,10 +103,13 @@ mod tests {
 
             let result = Hugetlb::apply(&tmp, &hugetlb);
 
-            let re = Regex::new(r"(?P<pagesize>[0-9]+)[KMG]B").expect("create regex for parsing pagesize");
-            let caps = re.captures(&hugetlb.page_size).expect("should capture pagesize");
+            let page_size: String = hugetlb
+            .page_size
+            .chars()
+            .take_while(|c| c.is_digit(10))
+            .collect();
+            let page_size: u64 = page_size.parse().expect("parse page size");
 
-            let page_size: u64 = caps["pagesize"].parse().expect("should contain captured pagesize");
             if Hugetlb::is_power_of_two(page_size) && page_size != 1 {
                 let content =
                     read_to_string(tmp.join(page_file_name)).expect("Read hugetlb file content");