Skip to content

Commit f6e08f7

Browse files
cluxclux
committed
new clippy lint
1 parent fc5fb03 commit f6e08f7

File tree

10 files changed

+31
-31
lines changed

10 files changed

+31
-31
lines changed

‎kube-core/src/params.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ impl PatchParams {
294294
if self.force {
295295
qp.append_pair("force", "true");
296296
}
297-
if let Some(ref field_manager) = self.field_manager {
298-
qp.append_pair("fieldManager", &field_manager);
297+
if let Some(ref fm) = self.field_manager {
298+
qp.append_pair("fieldManager", fm);
299299
}
300300
}
301301

‎kube-core/src/request.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ impl Request {
3030
let mut qp = form_urlencoded::Serializer::new(target);
3131

3232
if let Some(fields) = &lp.field_selector {
33-
qp.append_pair("fieldSelector", &fields);
33+
qp.append_pair("fieldSelector", fields);
3434
}
3535
if let Some(labels) = &lp.label_selector {
36-
qp.append_pair("labelSelector", &labels);
36+
qp.append_pair("labelSelector", labels);
3737
}
3838
if let Some(limit) = &lp.limit {
3939
qp.append_pair("limit", &limit.to_string());
@@ -69,10 +69,10 @@ impl Request {
6969
// https://github.com/kubernetes/kubernetes/issues/6513
7070
qp.append_pair("timeoutSeconds", &lp.timeout.unwrap_or(290).to_string());
7171
if let Some(fields) = &lp.field_selector {
72-
qp.append_pair("fieldSelector", &fields);
72+
qp.append_pair("fieldSelector", fields);
7373
}
7474
if let Some(labels) = &lp.label_selector {
75-
qp.append_pair("labelSelector", &labels);
75+
qp.append_pair("labelSelector", labels);
7676
}
7777
if lp.bookmarks {
7878
qp.append_pair("allowWatchBookmarks", "true");
@@ -120,10 +120,10 @@ impl Request {
120120
let target = format!("{}?", self.url_path);
121121
let mut qp = form_urlencoded::Serializer::new(target);
122122
if let Some(fields) = &lp.field_selector {
123-
qp.append_pair("fieldSelector", &fields);
123+
qp.append_pair("fieldSelector", fields);
124124
}
125125
if let Some(labels) = &lp.label_selector {
126-
qp.append_pair("labelSelector", &labels);
126+
qp.append_pair("labelSelector", labels);
127127
}
128128
let urlstr = qp.finish();
129129
let body = serde_json::to_vec(&dp)?;

‎kube-core/src/subresource.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl Request {
4545
let mut qp = form_urlencoded::Serializer::new(target);
4646

4747
if let Some(container) = &lp.container {
48-
qp.append_pair("container", &container);
48+
qp.append_pair("container", container);
4949
}
5050

5151
if lp.follow {

‎kube/src/api/core_methods.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ where
4949
/// }
5050
/// ```
5151
pub async fn list(&self, lp: &ListParams) -> Result<ObjectList<K>> {
52-
let mut req = self.request.list(&lp)?;
52+
let mut req = self.request.list(lp)?;
5353
req.extensions_mut().insert("list");
5454
self.client.request::<ObjectList<K>>(req).await
5555
}
@@ -75,7 +75,7 @@ where
7575
K: Serialize,
7676
{
7777
let bytes = serde_json::to_vec(&data)?;
78-
let mut req = self.request.create(&pp, bytes)?;
78+
let mut req = self.request.create(pp, bytes)?;
7979
req.extensions_mut().insert("create");
8080
self.client.request::<K>(req).await
8181
}
@@ -103,7 +103,7 @@ where
103103
/// }
104104
/// ```
105105
pub async fn delete(&self, name: &str, dp: &DeleteParams) -> Result<Either<K, Status>> {
106-
let mut req = self.request.delete(name, &dp)?;
106+
let mut req = self.request.delete(name, dp)?;
107107
req.extensions_mut().insert("delete");
108108
self.client.request_status::<K>(req).await
109109
}
@@ -140,7 +140,7 @@ where
140140
dp: &DeleteParams,
141141
lp: &ListParams,
142142
) -> Result<Either<ObjectList<K>, Status>> {
143-
let mut req = self.request.delete_collection(&dp, &lp)?;
143+
let mut req = self.request.delete_collection(dp, lp)?;
144144
req.extensions_mut().insert("delete_collection");
145145
self.client.request_status::<ObjectList<K>>(req).await
146146
}
@@ -180,7 +180,7 @@ where
180180
pp: &PatchParams,
181181
patch: &Patch<P>,
182182
) -> Result<K> {
183-
let mut req = self.request.patch(name, &pp, patch)?;
183+
let mut req = self.request.patch(name, pp, patch)?;
184184
req.extensions_mut().insert("patch");
185185
self.client.request::<K>(req).await
186186
}
@@ -234,7 +234,7 @@ where
234234
K: Serialize,
235235
{
236236
let bytes = serde_json::to_vec(&data)?;
237-
let mut req = self.request.replace(name, &pp, bytes)?;
237+
let mut req = self.request.replace(name, pp, bytes)?;
238238
req.extensions_mut().insert("replace");
239239
self.client.request::<K>(req).await
240240
}
@@ -281,7 +281,7 @@ where
281281
lp: &ListParams,
282282
version: &str,
283283
) -> Result<impl Stream<Item = Result<WatchEvent<K>>>> {
284-
let mut req = self.request.watch(&lp, &version)?;
284+
let mut req = self.request.watch(lp, &version)?;
285285
req.extensions_mut().insert("watch");
286286
self.client.request_events::<K>(req).await
287287
}

‎kube/src/api/subresource.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ where
3838
pp: &PatchParams,
3939
patch: &Patch<P>,
4040
) -> Result<Scale> {
41-
let mut req = self.request.patch_subresource("scale", name, &pp, patch)?;
41+
let mut req = self.request.patch_subresource("scale", name, pp, patch)?;
4242
req.extensions_mut().insert("patch_scale");
4343
self.client.request::<Scale>(req).await
4444
}
4545

4646
/// Replace the scale subresource
4747
pub async fn replace_scale(&self, name: &str, pp: &PostParams, data: Vec<u8>) -> Result<Scale> {
48-
let mut req = self.request.replace_subresource("scale", name, &pp, data)?;
48+
let mut req = self.request.replace_subresource("scale", name, pp, data)?;
4949
req.extensions_mut().insert("replace_scale");
5050
self.client.request::<Scale>(req).await
5151
}
@@ -98,7 +98,7 @@ where
9898
pp: &PatchParams,
9999
patch: &Patch<P>,
100100
) -> Result<K> {
101-
let mut req = self.request.patch_subresource("status", name, &pp, patch)?;
101+
let mut req = self.request.patch_subresource("status", name, pp, patch)?;
102102
req.extensions_mut().insert("patch_status");
103103
self.client.request::<K>(req).await
104104
}
@@ -123,7 +123,7 @@ where
123123
/// }
124124
/// ```
125125
pub async fn replace_status(&self, name: &str, pp: &PostParams, data: Vec<u8>) -> Result<K> {
126-
let mut req = self.request.replace_subresource("status", name, &pp, data)?;
126+
let mut req = self.request.replace_subresource("status", name, pp, data)?;
127127
req.extensions_mut().insert("replace_status");
128128
self.client.request::<K>(req).await
129129
}

‎kube/src/client/auth/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ fn token_from_gcp_provider(provider: &AuthProviderConfig) -> Result<ProviderToke
222222

223223
if let Some(field) = provider.config.get("token-key") {
224224
let json_output: serde_json::Value = serde_json::from_slice(&output.stdout)?;
225-
let token = extract_value(&json_output, &field)?;
225+
let token = extract_value(&json_output, field)?;
226226
if let Some(field) = provider.config.get("expiry-key") {
227-
let expiry = extract_value(&json_output, &field)?;
227+
let expiry = extract_value(&json_output, field)?;
228228
let expiry = expiry
229229
.parse::<DateTime<Utc>>()
230230
.map_err(ConfigError::MalformedTokenExpirationDate)?;

‎kube/src/client/tls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub mod native_tls {
2424
if let Some(ders) = root_cert {
2525
for der in ders {
2626
builder.add_root_certificate(
27-
Certificate::from_der(&der).map_err(|e| Error::SslError(format!("{}", e)))?,
27+
Certificate::from_der(der).map_err(|e| Error::SslError(format!("{}", e)))?,
2828
);
2929
}
3030
}
@@ -40,8 +40,8 @@ pub mod native_tls {
4040
// TODO Replace this with pure Rust implementation to avoid depending on openssl on macOS and Win
4141
fn pkcs12_from_pem(pem: &[u8], password: &str) -> Result<Vec<u8>> {
4242
use openssl::{pkcs12::Pkcs12, pkey::PKey, x509::X509};
43-
let x509 = X509::from_pem(&pem)?;
44-
let pkey = PKey::private_key_from_pem(&pem)?;
43+
let x509 = X509::from_pem(pem)?;
44+
let pkey = PKey::private_key_from_pem(pem)?;
4545
let p12 = Pkcs12::builder().build(password, "kubeconfig", &pkey, &x509)?;
4646
let der = p12.to_der()?;
4747
Ok(der)

‎kube/src/config/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl Config {
156156

157157
if let Some(ca_bundle) = loader.ca_bundle()? {
158158
for ca in &ca_bundle {
159-
accept_invalid_certs = hacky_cert_lifetime_for_macos(&ca);
159+
accept_invalid_certs = hacky_cert_lifetime_for_macos(ca);
160160
}
161161
root_cert = Some(ca_bundle);
162162
}

‎kube/src/discovery/oneshot.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ use kube_core::{
4040
pub async fn group(client: &Client, apigroup: &str) -> Result<ApiGroup> {
4141
if apigroup == ApiGroup::CORE_GROUP {
4242
let coreapis = client.list_core_api_versions().await?;
43-
return ApiGroup::query_core(&client, coreapis).await;
43+
return ApiGroup::query_core(client, coreapis).await;
4444
} else {
4545
let api_groups = client.list_api_groups().await?;
4646
for g in api_groups.groups {
4747
if g.name != apigroup {
4848
continue;
4949
}
50-
return ApiGroup::query_apis(&client, g).await;
50+
return ApiGroup::query_apis(client, g).await;
5151
}
5252
}
5353
Err(DiscoveryError::MissingApiGroup(apigroup.to_string()).into())
@@ -77,7 +77,7 @@ pub async fn group(client: &Client, apigroup: &str) -> Result<ApiGroup> {
7777
/// than a single `kind`.
7878
/// If you only need a single `kind`, [`oneshot::pinned_kind`](crate::discovery::pinned_kind) is the best solution.
7979
pub async fn pinned_group(client: &Client, gv: &GroupVersion) -> Result<ApiGroup> {
80-
ApiGroup::query_gv(&client, gv).await
80+
ApiGroup::query_gv(client, gv).await
8181
}
8282

8383
/// Single discovery for a single GVK
@@ -100,5 +100,5 @@ pub async fn pinned_group(client: &Client, gv: &GroupVersion) -> Result<ApiGroup
100100
/// }
101101
/// ```
102102
pub async fn pinned_kind(client: &Client, gvk: &GroupVersionKind) -> Result<(ApiResource, ApiCapabilities)> {
103-
ApiGroup::query_gvk(client, &gvk).await
103+
ApiGroup::query_gvk(client, gvk).await
104104
}

‎kube/src/discovery/version.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl Ord for Version {
7777

7878
impl PartialOrd for Version {
7979
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
80-
Some(self.cmp(&other))
80+
Some(self.cmp(other))
8181
}
8282
}
8383

0 commit comments

Comments
 (0)