mirror of
https://github.com/actix/examples
synced 2025-06-26 17:17:42 +02:00
Use captured args in format string (#558)
This commit is contained in:
@ -81,9 +81,9 @@ async fn main() -> std::io::Result<()> {
|
||||
let aws_s3_bucket_name =
|
||||
env::var("AWS_S3_BUCKET_NAME").expect("AWS_S3_BUCKET_NAME must be set");
|
||||
|
||||
log::info!("aws_access_key_id: {}", aws_access_key_id);
|
||||
log::info!("aws_secret_access_key: {}", aws_secret_access_key);
|
||||
log::info!("aws_s3_bucket_name: {}", aws_s3_bucket_name);
|
||||
log::info!("aws_access_key_id: {aws_access_key_id}");
|
||||
log::info!("aws_secret_access_key: {aws_secret_access_key}");
|
||||
log::info!("aws_s3_bucket_name: {aws_s3_bucket_name}");
|
||||
|
||||
std::fs::create_dir_all("./tmp").unwrap();
|
||||
|
||||
|
@ -24,10 +24,9 @@ impl Client {
|
||||
|
||||
pub fn url(&self, key: &str) -> String {
|
||||
format!(
|
||||
"https://{}.s3.{}.amazonaws.com/{}",
|
||||
"https://{}.s3.{}.amazonaws.com/{key}",
|
||||
std::env::var("AWS_S3_BUCKET_NAME").unwrap(),
|
||||
std::env::var("AWS_REGION").unwrap(),
|
||||
key
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ impl Tmpfile {
|
||||
fn new(filename: &str) -> Tmpfile {
|
||||
Tmpfile {
|
||||
name: filename.to_string(),
|
||||
tmp_path: format!("./tmp/{}", filename),
|
||||
tmp_path: format!("./tmp/{filename}"),
|
||||
s3_key: "".to_string(),
|
||||
s3_url: "".to_string(),
|
||||
}
|
||||
@ -51,7 +51,7 @@ impl Tmpfile {
|
||||
}
|
||||
|
||||
async fn s3_upload(&mut self, s3_upload_key: String) {
|
||||
let key = format!("{}{}", &s3_upload_key, &self.name);
|
||||
let key = format!("{s3_upload_key}{}", &self.name);
|
||||
self.s3_key = key.clone();
|
||||
let url: String = Client::new().put_object(&self.tmp_path, &key.clone()).await;
|
||||
self.s3_url = url;
|
||||
|
Reference in New Issue
Block a user