Skip to content

Commit

Permalink
Minor internal fixes.
Browse files Browse the repository at this point in the history 
- Fix the name of the match binding of the result of `http::Request::body`
  to be `request` instead of `body`.

- Use `to_owned` to convert `&str` to `String` instead of `to_string` so that
  it's easier to audit for.
  • Loading branch information
Arnavion committed Jul 21, 2019
1 parent 16d7e71 commit 9d55072
Show file tree
Hide file tree
Showing 730 changed files with 9,024 additions and 9,024 deletions.
8 changes: 4 additions & 4 deletions k8s-openapi-codegen-common/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ pub fn run<W>(
writeln!(out, " }}")?;
writeln!(out)?;
writeln!(out, " fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> where E: serde::de::Error {{")?;
writeln!(out, " self.visit_string(v.to_string())")?;
writeln!(out, " self.visit_string(v.to_owned())")?;
writeln!(out, " }}")?;
writeln!(out)?;
writeln!(out, " fn visit_string<E>(self, v: String) -> Result<Self::Value, E> where E: serde::de::Error {{")?;
Expand Down Expand Up @@ -1627,7 +1627,7 @@ pub fn write_operation(
if have_query_parameters {
write!(out, "?")?;
}
writeln!(out, r#"".to_string();"#)?;
writeln!(out, r#"".to_owned();"#)?;
}

if have_query_parameters {
Expand Down Expand Up @@ -1703,7 +1703,7 @@ pub fn write_operation(

if operation_result_name.is_some() {
writeln!(out, "{} match __request.body(__body) {{", indent)?;
writeln!(out, "{} Ok(body) => Ok((body, {}::ResponseBody::new)),", indent, crate_root)?;
writeln!(out, "{} Ok(request) => Ok((request, {}::ResponseBody::new)),", indent, crate_root)?;
writeln!(out, "{} Err(err) => Err({}::RequestError::Http(err)),", indent, crate_root)?;
writeln!(out, "{} }}", indent)?;
}
Expand Down Expand Up @@ -1831,7 +1831,7 @@ pub fn write_operation(
writeln!(out, " ),")?;
writeln!(out, " }},")?;
writeln!(out, " }};")?;
writeln!(out, " Ok(({}::{}(result.to_string()), len))", operation_result_name, variant_name)?;
writeln!(out, " Ok(({}::{}(result.to_owned()), len))", operation_result_name, variant_name)?;
},

swagger20::SchemaKind::Ref(_) => if is_watch {
Expand Down
24 changes: 12 additions & 12 deletions src/v1_10/api/admissionregistration/v1alpha1/initializer_configuration.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl InitializerConfiguration {
let CreateInitializerConfigurationOptional {
pretty,
} = optional;
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
if let Some(pretty) = pretty {
__query_pairs.append_pair("pretty", pretty);
Expand All @@ -43,7 +43,7 @@ impl InitializerConfiguration {
let mut __request = http::Request::post(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -130,15 +130,15 @@ impl InitializerConfiguration {
delete_optional: crate::v1_10::DeleteOptional<'_>,
list_optional: crate::v1_10::ListOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<DeleteCollectionInitializerConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
list_optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::delete(__url);
let __body = serde_json::to_vec(&delete_optional).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -221,7 +221,7 @@ impl InitializerConfiguration {
let mut __request = http::Request::delete(__url);
let __body = serde_json::to_vec(&optional).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -294,15 +294,15 @@ impl InitializerConfiguration {
pub fn list_initializer_configuration(
optional: crate::v1_10::ListOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<ListInitializerConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -382,7 +382,7 @@ impl InitializerConfiguration {
let mut __request = http::Request::patch(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -474,7 +474,7 @@ impl InitializerConfiguration {
let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -565,7 +565,7 @@ impl InitializerConfiguration {
let mut __request = http::Request::put(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -640,15 +640,15 @@ impl InitializerConfiguration {
pub fn watch_initializer_configuration(
optional: crate::v1_10::WatchOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<WatchInitializerConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1alpha1/initializerconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/v1_10/api/admissionregistration/v1beta1/mutating_webhook_configuration.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl MutatingWebhookConfiguration {
let CreateMutatingWebhookConfigurationOptional {
pretty,
} = optional;
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
if let Some(pretty) = pretty {
__query_pairs.append_pair("pretty", pretty);
Expand All @@ -43,7 +43,7 @@ impl MutatingWebhookConfiguration {
let mut __request = http::Request::post(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -130,15 +130,15 @@ impl MutatingWebhookConfiguration {
delete_optional: crate::v1_10::DeleteOptional<'_>,
list_optional: crate::v1_10::ListOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<DeleteCollectionMutatingWebhookConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
list_optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::delete(__url);
let __body = serde_json::to_vec(&delete_optional).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -221,7 +221,7 @@ impl MutatingWebhookConfiguration {
let mut __request = http::Request::delete(__url);
let __body = serde_json::to_vec(&optional).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -294,15 +294,15 @@ impl MutatingWebhookConfiguration {
pub fn list_mutating_webhook_configuration(
optional: crate::v1_10::ListOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<ListMutatingWebhookConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -382,7 +382,7 @@ impl MutatingWebhookConfiguration {
let mut __request = http::Request::patch(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -474,7 +474,7 @@ impl MutatingWebhookConfiguration {
let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -565,7 +565,7 @@ impl MutatingWebhookConfiguration {
let mut __request = http::Request::put(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -640,15 +640,15 @@ impl MutatingWebhookConfiguration {
pub fn watch_mutating_webhook_configuration(
optional: crate::v1_10::WatchOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<WatchMutatingWebhookConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/v1_10/api/admissionregistration/v1beta1/validating_webhook_configuration.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl ValidatingWebhookConfiguration {
let CreateValidatingWebhookConfigurationOptional {
pretty,
} = optional;
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
if let Some(pretty) = pretty {
__query_pairs.append_pair("pretty", pretty);
Expand All @@ -43,7 +43,7 @@ impl ValidatingWebhookConfiguration {
let mut __request = http::Request::post(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -130,15 +130,15 @@ impl ValidatingWebhookConfiguration {
delete_optional: crate::v1_10::DeleteOptional<'_>,
list_optional: crate::v1_10::ListOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<DeleteCollectionValidatingWebhookConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
list_optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::delete(__url);
let __body = serde_json::to_vec(&delete_optional).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -221,7 +221,7 @@ impl ValidatingWebhookConfiguration {
let mut __request = http::Request::delete(__url);
let __body = serde_json::to_vec(&optional).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -294,15 +294,15 @@ impl ValidatingWebhookConfiguration {
pub fn list_validating_webhook_configuration(
optional: crate::v1_10::ListOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<ListValidatingWebhookConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -382,7 +382,7 @@ impl ValidatingWebhookConfiguration {
let mut __request = http::Request::patch(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -474,7 +474,7 @@ impl ValidatingWebhookConfiguration {
let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -565,7 +565,7 @@ impl ValidatingWebhookConfiguration {
let mut __request = http::Request::put(__url);
let __body = serde_json::to_vec(&body).map_err(crate::RequestError::Json)?;
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down Expand Up @@ -640,15 +640,15 @@ impl ValidatingWebhookConfiguration {
pub fn watch_validating_webhook_configuration(
optional: crate::v1_10::WatchOptional<'_>,
) -> Result<(http::Request<Vec<u8>>, fn(http::StatusCode) -> crate::ResponseBody<WatchValidatingWebhookConfigurationResponse>), crate::RequestError> {
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_string();
let __url = "/apis/admissionregistration.k8s.io/v1beta1/validatingwebhookconfigurations?".to_owned();
let mut __query_pairs = crate::url::form_urlencoded::Serializer::new(__url);
optional.__serialize(&mut __query_pairs);
let __url = __query_pairs.finish();

let mut __request = http::Request::get(__url);
let __body = vec![];
match __request.body(__body) {
Ok(body) => Ok((body, crate::ResponseBody::new)),
Ok(request) => Ok((request, crate::ResponseBody::new)),
Err(err) => Err(crate::RequestError::Http(err)),
}
}
Expand Down
Loading

0 comments on commit 9d55072

Please sign in to comment.