summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Schreiber <schrieveslaach@online.de>2019-02-25 15:27:21 +0100
committerdoug tangren <d.tangren@gmail.com>2019-02-25 09:27:21 -0500
commiteb98b1916c0220e44e2d0f3c869c01a2dd037f60 (patch)
tree40b2e2c6bbfecc26670f4fb19d89acc80e62a42b
parentad95d93204cc84cc4648a1defac786db3ddd8582 (diff)
Apply rust format to fix CI checks (#153)
-rw-r--r--examples/containercopyinto.rs7
-rw-r--r--src/lib.rs20
2 files changed, 15 insertions, 12 deletions
diff --git a/examples/containercopyinto.rs b/examples/containercopyinto.rs
index df56ca2..fb2de50 100644
--- a/examples/containercopyinto.rs
+++ b/examples/containercopyinto.rs
@@ -11,13 +11,12 @@ fn main() {
.nth(2)
.expect("Usage: cargo run --example containercopyinto -- <local path> <container>");
-
- use std::fs::File;
- use std::io::prelude::*;
+ use std::{fs::File, io::prelude::*};
let mut file = File::open(&path).unwrap();
let mut bytes = Vec::new();
- file.read_to_end(&mut bytes).expect("Cannot read file on the localhost.");
+ file.read_to_end(&mut bytes)
+ .expect("Cannot read file on the localhost.");
let fut = docker
.containers()
diff --git a/src/lib.rs b/src/lib.rs
index e733440..5918205 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -513,17 +513,18 @@ impl<'a, 'b> Container<'a, 'b> {
pub fn copy_file_into(
&self,
path: &Path,
- bytes: &[u8]
+ bytes: &[u8],
) -> impl Future<Item = (), Error = Error> {
-
let mut ar = tar::Builder::new(Vec::new());
let mut header = tar::Header::new_gnu();
header.set_size(bytes.len() as u64);
header.set_mode(0o0644);
- ar.append_data(&mut header,
+ ar.append_data(
+ &mut header,
path.file_name().map(|f| f.to_str().unwrap()).unwrap(),
- bytes
- ).unwrap();
+ bytes,
+ )
+ .unwrap();
let data = ar.into_inner().unwrap();
let body = Some((data, "application/x-tar".parse::<Mime>().unwrap()));
@@ -533,7 +534,10 @@ impl<'a, 'b> Container<'a, 'b> {
.finish();
self.docker
- .put(&format!("/containers/{}/archive?{}", self.id, path_arg), body)
+ .put(
+ &format!("/containers/{}/archive?{}", self.id, path_arg),
+ body,
+ )
.map(|_| ())
}
}
@@ -1004,8 +1008,8 @@ impl Docker {
endpoint: &str,
body: Option<(B, Mime)>,
) -> impl Future<Item = String, Error = Error>
- where
- B: Into<Body>,
+ where
+ B: Into<Body>,
{
self.transport.request(Method::PUT, endpoint, body)
}