fix lints (51f70418) · Commits · Public Repositories / s3s

crates/s3s-codegen/src/error.rs

+2 −2

Original line number	Diff line number	Diff line
		@@ -133,13 +133,13 @@ pub fn codegen(model: &smithy::Model, g: &mut Codegen) {
		let status = &err.status[0];

		if let Some(ref desc) = desc {
		g.ln(f!("/// {}", desc));
		g.ln(f!("/// {desc}"));
		}
		if let Some(ref status) = status {
		if desc.is_some() {
		g.ln("///");
		}
		g.ln(f!("/// HTTP Status Code: {}", status));
		g.ln(f!("/// HTTP Status Code: {status}"));
		}
		if desc.is_some() \|\| status.is_some() {
		g.ln("///");

crates/s3s-codegen/src/ops.rs

+12 −15

Original line number	Diff line number	Diff line
		@@ -240,17 +240,17 @@ fn codegen_xml_ser(ops: &Operations, rust_types: &RustTypes, g: &mut Codegen) {
		g.ln(f!("let iter = &self.{};", field.name));
		}
		if field.xml_flattened {
		g.ln(f!("s.flattened_list(\"{}\", iter)?;", xml_name));
		g.ln(f!("s.flattened_list(\"{xml_name}\", iter)?;"));
		} else {
		let member_xml_name = list_ty.member.xml_name.as_deref().unwrap();
		g.ln(f!("s.list(\"{}\", \"{}\", iter)?;", xml_name, member_xml_name));
		g.ln(f!("s.list(\"{xml_name}\", \"{member_xml_name}\", iter)?;"));
		}
		g.ln("}");
		} else if let rust::Type::Timestamp(ts_ty) = field_ty {
		let fmt = ts_ty.format.as_deref().unwrap_or("DateTime");
		if field.option_type {
		g.ln(f!("if let Some(ref val) = self.{} {{", field.name));
		g.ln(f!("s.timestamp(\"{}\", val, TimestampFormat::{})?;", xml_name, fmt));
		g.ln(f!("s.timestamp(\"{xml_name}\", val, TimestampFormat::{fmt})?;"));
		g.ln("}");
		} else {
		g.ln(f!(
		@@ -262,7 +262,7 @@ fn codegen_xml_ser(ops: &Operations, rust_types: &RustTypes, g: &mut Codegen) {
		}
		} else if field.option_type {
		g.ln(f!("if let Some(ref val) = self.{} {{", field.name));
		g.ln(f!("s.content(\"{}\", val)?;", xml_name));
		g.ln(f!("s.content(\"{xml_name}\", val)?;"));
		g.ln("}");
		} else {
		g.ln(f!("s.content(\"{}\", &self.{})?;", xml_name, field.name));
		@@ -633,7 +633,7 @@ fn codegen_op_http_ser(op: &Operation, rust_types: &RustTypes, g: &mut Codegen)
		g.ln("let mut res = http::Response::default();");

		let code_name = status_code_name(op.http_code);
		g.ln(f!("*res.status_mut() = http::StatusCode::{};", code_name));
		g.ln(f!("*res.status_mut() = http::StatusCode::{code_name};"));

		g.ln("res");
		}
		@@ -641,7 +641,7 @@ fn codegen_op_http_ser(op: &Operation, rust_types: &RustTypes, g: &mut Codegen)
		g.ln("}");
		}
		rust::Type::Struct(ty) => {
		g.ln(f!("pub fn serialize_http(x: {}) -> S3Result<http::Response> {{", output));
		g.ln(f!("pub fn serialize_http(x: {output}) -> S3Result<http::Response> {{"));

		assert!(ty.fields.is_empty().not());
		for field in &ty.fields {
		@@ -652,7 +652,7 @@ fn codegen_op_http_ser(op: &Operation, rust_types: &RustTypes, g: &mut Codegen)

		if op.http_code != 200 {
		let code_name = status_code_name(op.http_code);
		g.ln(f!("*res.status_mut() = http::StatusCode::{};", code_name));
		g.ln(f!("*res.status_mut() = http::StatusCode::{code_name};"));
		}

		if is_xml_output(ty) {
		@@ -730,10 +730,7 @@ fn codegen_op_http_de(op: &Operation, rust_types: &RustTypes, g: &mut Codegen) {
		assert_eq!(ty.name, "Unit");
		}
		rust::Type::Struct(ty) => {
		g.ln(f!(
		"pub fn deserialize_http(req: &mut http::Request) -> S3Result<{}> {{",
		input
		));
		g.ln(f!("pub fn deserialize_http(req: &mut http::Request) -> S3Result<{input}> {{"));

		if op.name == "PutObject" {
		// POST object
		@@ -898,7 +895,7 @@ fn codegen_op_http_de(op: &Operation, rust_types: &RustTypes, g: &mut Codegen) {
		g.lf();
		}

		g.ln(f!("Ok({} {{", input));
		g.ln(f!("Ok({input} {{"));
		for field in &ty.fields {
		match field.position.as_str() {
		"bucket" \| "key" \| "query" \| "header" \| "metadata" \| "payload" => {
		@@ -1024,9 +1021,9 @@ fn codegen_op_http_call(op: &Operation, g: &mut Codegen) {

		if op.input != "Unit" {
		g.ln("let input = Self::deserialize_http(req)?;");
		g.ln(f!("let result = s3.{}(input).await;", method));
		g.ln(f!("let result = s3.{method}(input).await;"));
		} else {
		g.ln(f!("let result = s3.{}().await;", method));
		g.ln(f!("let result = s3.{method}().await;"));
		}

		g.ln("let res = match result {");
		@@ -1210,7 +1207,7 @@ fn codegen_router(ops: &Operations, rust_types: &RustTypes, g: &mut Codegen) {

		g.ln("match req.method().clone() {");
		for &method in &methods {
		g.ln(f!("hyper::Method::{} => match s3_path {{", method));
		g.ln(f!("hyper::Method::{method} => match s3_path {{"));

		for pattern in [PathPattern::Root, PathPattern::Bucket, PathPattern::Object] {
		let s3_path_pattern = match pattern {

crates/s3s-codegen/src/rust.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -173,6 +173,6 @@ pub fn codegen_doc(doc: Option<&str>, g: &mut Codegen) {
		line = line.replace("OK</code>", "OK");
		}

		g.ln(f!("/// {}", line));
		g.ln(f!("/// {line}"));
		}
		}

crates/s3s-fs/src/s3.rs

+7 −7

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ impl S3 for FileSystem {
		let md5_sum = self.get_md5_sum(bucket, key).await?;

		let mut copy_object_result = CopyObjectResult::default();
		copy_object_result.e_tag = Some(format!("\"{}\"", md5_sum));
		copy_object_result.e_tag = Some(format!("\"{md5_sum}\""));
		copy_object_result.last_modified = Some(last_modified);

		let mut output = CopyObjectOutput::default();
		@@ -189,7 +189,7 @@ impl S3 for FileSystem {
		output.content_length = try_!(i64::try_from(content_length));
		output.last_modified = Some(last_modified);
		output.metadata = object_metadata;
		output.e_tag = Some(format!("\"{}\"", md5_sum));
		output.e_tag = Some(format!("\"{md5_sum}\""));
		Ok(output)
		}

		@@ -387,7 +387,7 @@ impl S3 for FileSystem {
		}

		let mut output = PutObjectOutput::default();
		output.e_tag = Some(format!("\"{}\"", md5_sum));
		output.e_tag = Some(format!("\"{md5_sum}\""));
		// TODO: other fields?

		Ok(output)
		@@ -420,7 +420,7 @@ impl S3 for FileSystem {
		return Err(s3_error!(InvalidRequest));
		}

		let file_path_str = format!(".upload_id-{}.part-{}", upload_id, part_number);
		let file_path_str = format!(".upload_id-{upload_id}.part-{part_number}");
		let file_path = try_!(Path::new(&file_path_str).absolutize_virtually(&self.root));

		let mut md5_hash = Md5::new();
		@@ -435,7 +435,7 @@ impl S3 for FileSystem {
		debug!(path = %file_path.display(), ?size, %md5_sum, "write file");

		let mut output = UploadPartOutput::default();
		output.e_tag = Some(format!("\"{}\"", md5_sum));
		output.e_tag = Some(format!("\"{md5_sum}\""));
		Ok(output)
		}

		@@ -467,7 +467,7 @@ impl S3 for FileSystem {
		return Err(s3_error!(InvalidRequest));
		}

		let part_path_str = format!(".upload_id-{}.part-{}", upload_id, part_number);
		let part_path_str = format!(".upload_id-{upload_id}.part-{part_number}");
		let part_path = try_!(Path::new(&part_path_str).absolutize_virtually(&self.root));

		let mut reader = try_!(fs::File::open(&part_path).await);
		@@ -486,7 +486,7 @@ impl S3 for FileSystem {
		let mut output = CompleteMultipartUploadOutput::default();
		output.bucket = Some(bucket);
		output.key = Some(key);
		output.e_tag = Some(format!("\"{}\"", md5_sum));
		output.e_tag = Some(format!("\"{md5_sum}\""));
		Ok(output)
		}
		}

crates/s3s/src/dto/timestamp.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ impl Timestamp {
		let secs = (val / 1_000_000_000) as f64;
		let nanos = (val % 1_000_000_000) as f64 / 1_000_000_000.0;
		let ts = secs + nanos;
		write!(w, "{}", ts)?;
		write!(w, "{ts}")?;
		}
		}
		Ok(())