Skip to content

Commit

Permalink
more clippy-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
sepiropht committed Oct 7, 2019
1 parent 9cd6d57 commit 7fb7244
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions service_crategen/src/commands/generate/codegen/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ fn generate_list_serializer(service: &Service<'_>, shape: &Shape) -> String {
if primitive {
parts.push(format!(
"params.put(&key, {});",
serialize_primitive_expression(&member_shape.shape_type, "obj")
serialize_primitive_expression(member_shape.shape_type, "obj")
));
} else {
parts.push(format!(
Expand Down Expand Up @@ -357,7 +357,7 @@ fn optional_primitive_field_serializer(
return "".to_owned();
}
let member_shape = service.shape_for_member(member).unwrap();
let expression = serialize_primitive_expression(&member_shape.shape_type, "field_value");
let expression = serialize_primitive_expression(member_shape.shape_type, "field_value");

format!(
"if let Some(ref field_value) = obj.{field_name} {{
Expand All @@ -376,7 +376,7 @@ fn required_primitive_field_serializer(
) -> String {
let member_shape = service.shape_for_member(member).unwrap();
let expression = serialize_primitive_expression(
&member_shape.shape_type,
member_shape.shape_type,
&format!("obj.{}", generate_field_name(member_name)),
);

Expand All @@ -387,8 +387,8 @@ fn required_primitive_field_serializer(
)
}

fn serialize_primitive_expression(shape_type: &ShapeType, var_name: &str) -> String {
match *shape_type {
fn serialize_primitive_expression(shape_type: ShapeType, var_name: &str) -> String {
match shape_type {
ShapeType::String
| ShapeType::Timestamp
| ShapeType::Integer
Expand Down
2 changes: 1 addition & 1 deletion service_crategen/src/commands/generate/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ fn generate_examples(crate_dir_path: &Path) -> Option<String> {
pub fn generate_services(
services: &BTreeMap<String, ServiceConfig>,
out_dir: &Path,
service_to_generate: &Option<&Vec<&str>>,
service_to_generate: Option<&Vec<&str>>,
) {
if !out_dir.exists() {
fs::create_dir(out_dir).expect("Unable to create output directory");
Expand Down
2 changes: 1 addition & 1 deletion service_crategen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ fn main() {
.values_of("service")
.map(std::iter::Iterator::collect);

commands::generate::generate_services(&service_configs, out_dir, &service.as_ref());
commands::generate::generate_services(&service_configs, out_dir, service.as_ref());
}
}

0 comments on commit 7fb7244

Please sign in to comment.