diff options
author | Eli W. Hunter <42009212+elihunter173@users.noreply.github.com> | 2021-02-20 19:36:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-20 19:36:31 -0500 |
commit | 9c72d3aacb675c5bcff238ce4996dbbe138e11c8 (patch) | |
tree | 692b95faa1a8226a6c29efe1f349ae999eddc735 /examples | |
parent | 5af822c5691a772cad36bd9a69e94419b03d4511 (diff) |
Fix lifetimes (#272)
* Some changes
* Clarify lifetimes in transport.rs
* Fix remaining easy lifetimes in lib.rs
* Refactor Images::build for new lifetimes to work
* Fix Exec::start()
* Fix Container::exec()
* Make header_bytes not a Vec
* Make Docker::{images,...}() lifetimes explicit
* Fix Containers::get()
* Remove unnecessary locals from examples
* Update changelog
* Appease clippy
Diffstat (limited to 'examples')
-rw-r--r-- | examples/attach.rs | 3 | ||||
-rw-r--r-- | examples/containerlogs.rs | 5 | ||||
-rw-r--r-- | examples/export.rs | 4 | ||||
-rw-r--r-- | examples/imagebuild.rs | 5 | ||||
-rw-r--r-- | examples/networkdisconnect.rs | 5 | ||||
-rw-r--r-- | examples/servicelogs.rs | 5 | ||||
-rw-r--r-- | examples/volumecreate.rs | 4 | ||||
-rw-r--r-- | examples/volumedelete.rs | 3 | ||||
-rw-r--r-- | examples/volumes.rs | 4 |
9 files changed, 13 insertions, 25 deletions
diff --git a/examples/attach.rs b/examples/attach.rs index 769bc64..e4ed637 100644 --- a/examples/attach.rs +++ b/examples/attach.rs @@ -9,8 +9,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { .nth(1) .expect("You need to specify a container id"); - let containers = docker.containers(); - let tty_multiplexer = containers.get(&id).attach().await?; + let tty_multiplexer = docker.containers().get(&id).attach().await?; let (mut reader, _writer) = tty_multiplexer.split(); diff --git a/examples/containerlogs.rs b/examples/containerlogs.rs index eb3bdb5..73c8045 100644 --- a/examples/containerlogs.rs +++ b/examples/containerlogs.rs @@ -9,9 +9,8 @@ async fn main() { .nth(1) .expect("You need to specify a container id"); - let containers = docker.containers(); - - let mut logs_stream = containers + let mut logs_stream = docker + .containers() .get(&id) .logs(&LogsOptions::builder().stdout(true).stderr(true).build()); diff --git a/examples/export.rs b/examples/export.rs index 34f460d..22c543e 100644 --- a/examples/export.rs +++ b/examples/export.rs @@ -14,9 +14,7 @@ async fn main() { .open(format!("{}.tar", &id)) .unwrap(); - let images = docker.images(); - - while let Some(export_result) = images.get(&id).export().next().await { + while let Some(export_result) = docker.images().get(&id).export().next().await { match export_result.and_then(|bytes| export_file.write(&bytes).map_err(Error::from)) { Ok(n) => println!("copied {} bytes", n), Err(e) => eprintln!("Error: {}", e), diff --git a/examples/imagebuild.rs b/examples/imagebuild.rs index 80d825c..01647d4 100644 --- a/examples/imagebuild.rs +++ b/examples/imagebuild.rs @@ -9,10 +9,7 @@ async fn main() { let options = BuildOptions::builder(path).tag("shiplift_test").build(); - let images = docker.images(); - - let mut stream = images.build(&options); - + let mut stream = docker.images().build(&options); while let Some(build_result) = stream.next().await { match build_result { Ok(output) => println!("{:?}", output), diff --git a/examples/networkdisconnect.rs b/examples/networkdisconnect.rs index 8d58b35..78f33c6 100644 --- a/examples/networkdisconnect.rs +++ b/examples/networkdisconnect.rs @@ -6,9 +6,8 @@ async fn network_disconnect( network_id: &str, ) { let docker = Docker::new(); - let networks = docker.networks(); - - if let Err(e) = networks + if let Err(e) = docker + .networks() .get(network_id) .disconnect(&ContainerConnectionOptions::builder(container_id).build()) .await diff --git a/examples/servicelogs.rs b/examples/servicelogs.rs index 54d4743..e5f97c0 100644 --- a/examples/servicelogs.rs +++ b/examples/servicelogs.rs @@ -9,9 +9,8 @@ async fn main() { .nth(1) .expect("You need to specify a service name"); - let services = docker.services(); - - let mut logs_stream = services + let mut logs_stream = docker + .services() .get(&id) .logs(&LogsOptions::builder().stdout(true).stderr(true).build()); diff --git a/examples/volumecreate.rs b/examples/volumecreate.rs index a243be6..95bc575 100644 --- a/examples/volumecreate.rs +++ b/examples/volumecreate.rs @@ -4,7 +4,6 @@ use std::{collections::HashMap, env}; #[tokio::main] async fn main() { let docker = Docker::new(); - let volumes = docker.volumes(); let volume_name = env::args() .nth(1) @@ -13,7 +12,8 @@ async fn main() { let mut labels = HashMap::new(); labels.insert("com.github.softprops", "shiplift"); - match volumes + match docker + .volumes() .create( &VolumeCreateOptions::builder() .name(volume_name.as_ref()) diff --git a/examples/volumedelete.rs b/examples/volumedelete.rs index ec1da7e..46b37f6 100644 --- a/examples/volumedelete.rs +++ b/examples/volumedelete.rs @@ -4,13 +4,12 @@ use std::env; #[tokio::main] async fn main() { let docker = Docker::new(); - let volumes = docker.volumes(); let volume_name = env::args() .nth(1) .expect("You need to specify an volume name"); - if let Err(e) = volumes.get(&volume_name).delete().await { + if let Err(e) = docker.volumes().get(&volume_name).delete().await { eprintln!("Error: {}", e) } } diff --git a/examples/volumes.rs b/examples/volumes.rs index d45c00a..0bb82aa 100644 --- a/examples/volumes.rs +++ b/examples/volumes.rs @@ -3,9 +3,7 @@ use shiplift::Docker; #[tokio::main] async fn main() { let docker = Docker::new(); - let volumes = docker.volumes(); - - match volumes.list().await { + match docker.volumes().list().await { Ok(volumes) => { for v in volumes { println!("volume -> {:#?}", v) |