Merge pull request #66 from ericho/master

agent: Remove `get_key_value` to enable building in stable rust.

.travis.yml

@@ -11,7 +11,7 @@ os:
 
 language: rust
 rust:
-    - nightly
+    - stable
 
 env:
     - target_branch=$TRAVIS_BRANCH RUST_AGENT=yes

src/agent/README.md

@@ -45,9 +45,7 @@ The `rust-agent` depends on [`grpc-rs`](https://github.com/pingcap/grpc-rs) by P
 ### Build from Source
 The rust-agent need to be built with rust nightly, and static linked with musl.
 ```bash
-rustup toolchain install nightly
-rustup default nightly
-rustup target add x86_64-unknown-linux-musl --toolchain=nightly
+rustup target add x86_64-unknown-linux-musl
 git submodule update --init --recursive  
 sudo ln -s /usr/bin/g++ /bin/musl-g++  
 cargo build --target x86_64-unknown-linux-musl --release

src/agent/src/mount.rs

@@ -588,24 +588,22 @@ pub fn get_cgroup_mounts(logger: &Logger, cg_path: &str) -> Result<Vec<INIT_MOUN
             }
         }
 
-        match CGROUPS.get_key_value(fields[0]) {
-            Some((key, value)) => {
-                if *key == "" {
-                    continue;
-                }
+        if fields[0] == "" {
+            continue;
+        }
 
-                if *key == "devices" {
-                    has_device_cgroup = true;
-                }
+        if fields[0] == "devices" {
+            has_device_cgroup = true;
+        }
 
-                cg_mounts.push(INIT_MOUNT {
-                    fstype: "cgroup",
-                    src: "cgroup",
-                    dest: *value,
-                    options: vec!["nosuid", "nodev", "noexec", "relatime", *key],
-                });
-            }
-            None => continue,
+        if let Some(value) = CGROUPS.get(&fields[0]) {
+            let key = CGROUPS.keys().find(|&&f| f == fields[0]).unwrap();
+            cg_mounts.push(INIT_MOUNT {
+                fstype: "cgroup",
+                src: "cgroup",
+                dest: *value,
+                options: vec!["nosuid", "nodev", "noexec", "relatime", key]
+            });
         }
     }