summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDylan McKay <me@dylanmckay.io>2018-12-22 23:31:52 +1300
committerdoug tangren <d.tangren@gmail.com>2018-12-22 19:31:52 +0900
commit1c2665988c7cb90d77488ea9e1cb3f9bf4fb7bf8 (patch)
tree7bcb937186a9b5a6d7f1415b622cb0bc82759b78 /src
parentbf79d766cd9eaf57b2674629659fd298ad04e39f (diff)
Remove an unused type parameter from the 'nocache' function (#135)
* Remove an unused type parameter from the 'nocache' function The function is currently unusable because the type parameter has no uses or bounds. * Fix existing rustfmt violation Semicolons need to be added to return statements. Without this, the build fails. * Replace call of Uri::port to Uri::port_part The former is deprecated in favor of the latter. This causes a deprecation warning when compiling shiplift. This patch fixes the deprecation warning.
Diffstat (limited to 'src')
-rw-r--r--src/builder.rs2
-rw-r--r--src/lib.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/builder.rs b/src/builder.rs
index cc3fc83..9aaeb99 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -184,7 +184,7 @@ impl BuildOptionsBuilder {
}
/// don't use the image cache when building image
- pub fn nocache<R>(
+ pub fn nocache(
&mut self,
nc: bool,
) -> &mut Self {
diff --git a/src/lib.rs b/src/lib.rs
index 595157b..0932994 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -804,7 +804,7 @@ impl Docker {
"{}://{}:{}",
host.scheme_part().map(|s| s.as_str()).unwrap(),
host.host().unwrap().to_owned(),
- host.port().unwrap_or(80)
+ host.port_part().unwrap_or(80)
);
match host.scheme_part().map(|s| s.as_str()) {