Skip to content

Commit fd4c725

Browse files
HJLebbinkHJLebbink
committed
updated clients: added Into<String>in API
1 parent 2b37a27 commit fd4c725

File tree

79 files changed

+343
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+343
-273
lines changed

‎benches/s3/bench_bucket_exists.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ pub(crate) fn bench_bucket_exists(criterion: &mut Criterion) {
2323
"bucket_exists",
2424
criterion,
2525
|| async { Ctx2::new().await },
26-
|ctx| BucketExists::new(&ctx.client, ctx.bucket.to_owned()),
26+
|ctx| BucketExists::new(ctx.client.clone(), ctx.bucket.clone()),
2727
);
2828
}

‎benches/s3/bench_bucket_lifecycle.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ pub(crate) fn bench_set_bucket_lifecycle(criterion: &mut Criterion) {
2727
|| async { Ctx2::new().await },
2828
|ctx| {
2929
let config = create_bucket_lifecycle_config_examples();
30-
SetBucketLifecycle::new(&ctx.client, ctx.bucket.to_owned()).life_cycle_config(config)
30+
SetBucketLifecycle::new(ctx.client.clone(), ctx.bucket.clone())
31+
.life_cycle_config(config)
3132
},
3233
)
3334
}
@@ -46,14 +47,14 @@ pub(crate) fn bench_get_bucket_lifecycle(criterion: &mut Criterion) {
4647
.unwrap();
4748
ctx
4849
},
49-
|ctx| GetBucketLifecycle::new(&ctx.client, ctx.bucket.to_owned()),
50+
|ctx| GetBucketLifecycle::new(ctx.client.clone(), ctx.bucket.clone()),
5051
)
5152
}
5253
pub(crate) fn bench_delete_bucket_lifecycle(criterion: &mut Criterion) {
5354
benchmark_s3_api(
5455
"delete_bucket_lifecycle",
5556
criterion,
5657
|| async { Ctx2::new().await },
57-
|ctx| DeleteBucketLifecycle::new(&ctx.client, ctx.bucket.to_owned()),
58+
|ctx| DeleteBucketLifecycle::new(ctx.client.clone(), ctx.bucket.clone()),
5859
)
5960
}

‎benches/s3/bench_bucket_notification.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub(crate) fn bench_set_bucket_notification(criterion: &mut Criterion) {
2828
|| async { Ctx2::new().await },
2929
|ctx| {
3030
let config = create_bucket_notification_config_example();
31-
SetBucketNotification::new(&ctx.client, ctx.bucket.to_owned())
31+
SetBucketNotification::new(ctx.client.clone(), ctx.bucket.clone())
3232
.notification_config(config)
3333
},
3434
)
@@ -49,7 +49,7 @@ pub(crate) fn bench_get_bucket_notification(criterion: &mut Criterion) {
4949
.unwrap();
5050
ctx
5151
},
52-
|ctx| GetBucketNotification::new(&ctx.client, ctx.bucket.to_owned()),
52+
|ctx| GetBucketNotification::new(ctx.client.clone(), ctx.bucket.clone()),
5353
)
5454
}
5555
#[allow(dead_code)]
@@ -58,6 +58,6 @@ pub(crate) fn bench_delete_bucket_notification(criterion: &mut Criterion) {
5858
"delete_bucket_notification",
5959
criterion,
6060
|| async { Ctx2::new().await },
61-
|ctx| DeleteBucketNotification::new(&ctx.client, ctx.bucket.to_owned()),
61+
|ctx| DeleteBucketNotification::new(ctx.client.clone(), ctx.bucket.clone()),
6262
)
6363
}

‎benches/s3/bench_bucket_policy.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(crate) fn bench_set_bucket_policy(criterion: &mut Criterion) {
2727
|| async { Ctx2::new().await },
2828
|ctx| {
2929
let config = create_bucket_policy_config_example(&ctx.bucket);
30-
SetBucketPolicy::new(&ctx.client, ctx.bucket.to_owned()).config(config)
30+
SetBucketPolicy::new(ctx.client.clone(), ctx.bucket.clone()).config(config)
3131
},
3232
)
3333
}
@@ -38,21 +38,21 @@ pub(crate) fn bench_get_bucket_policy(criterion: &mut Criterion) {
3838
|| async {
3939
let ctx = Ctx2::new().await;
4040
let config = create_bucket_policy_config_example(&ctx.bucket);
41-
SetBucketPolicy::new(&ctx.client, ctx.bucket.to_owned())
41+
SetBucketPolicy::new(ctx.client.clone(), ctx.bucket.clone())
4242
.config(config)
4343
.send()
4444
.await
4545
.unwrap();
4646
ctx
4747
},
48-
|ctx| GetBucketPolicy::new(&ctx.client, ctx.bucket.to_owned()),
48+
|ctx| GetBucketPolicy::new(ctx.client.clone(), ctx.bucket.clone()),
4949
)
5050
}
5151
pub(crate) fn bench_delete_bucket_policy(criterion: &mut Criterion) {
5252
benchmark_s3_api(
5353
"delete_bucket_policy",
5454
criterion,
5555
|| async { Ctx2::new().await },
56-
|ctx| DeleteBucketPolicy::new(&ctx.client, ctx.bucket.to_owned()),
56+
|ctx| DeleteBucketPolicy::new(ctx.client.clone(), ctx.bucket.clone()),
5757
)
5858
}

‎benches/s3/bench_bucket_replication.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ pub(crate) fn bench_set_bucket_replication(criterion: &mut Criterion) {
5353
|ctx| {
5454
let config =
5555
create_bucket_replication_config_example(ctx.aux_bucket.clone().unwrap().as_str());
56-
SetBucketReplication::new(&ctx.client, ctx.bucket.to_owned()).replication_config(config)
56+
SetBucketReplication::new(ctx.client.clone(), ctx.bucket.clone())
57+
.replication_config(config)
5758
},
5859
)
5960
}
@@ -84,7 +85,7 @@ pub(crate) fn bench_get_bucket_replication(criterion: &mut Criterion) {
8485

8586
ctx
8687
},
87-
|ctx| GetBucketReplication::new(&ctx.client, ctx.bucket.to_owned()),
88+
|ctx| GetBucketReplication::new(ctx.client.clone(), ctx.bucket.clone()),
8889
)
8990
}
9091
#[allow(dead_code)]
@@ -114,6 +115,6 @@ pub(crate) fn bench_delete_bucket_replication(criterion: &mut Criterion) {
114115

115116
ctx
116117
},
117-
|ctx| DeleteBucketReplication::new(&ctx.client, ctx.bucket.to_owned()),
118+
|ctx| DeleteBucketReplication::new(ctx.client.clone(), ctx.bucket.clone()),
118119
)
119120
}

‎benches/s3/bench_bucket_tags.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ pub(crate) fn bench_set_bucket_tags(criterion: &mut Criterion) {
2828
"set_bucket_tags",
2929
criterion,
3030
|| async { Ctx2::new().await },
31-
|ctx| SetBucketTags::new(&ctx.client, ctx.bucket.to_owned()).tags(create_tags_example()),
31+
|ctx| {
32+
SetBucketTags::new(ctx.client.clone(), ctx.bucket.clone()).tags(create_tags_example())
33+
},
3234
)
3335
}
3436
pub(crate) fn bench_get_bucket_tags(criterion: &mut Criterion) {
@@ -48,7 +50,7 @@ pub(crate) fn bench_get_bucket_tags(criterion: &mut Criterion) {
4850
.unwrap();
4951
ctx
5052
},
51-
|ctx| GetBucketTags::new(&ctx.client, ctx.bucket.to_owned()),
53+
|ctx| GetBucketTags::new(ctx.client.clone(), ctx.bucket.clone()),
5254
)
5355
}
5456
pub(crate) fn bench_delete_bucket_tags(criterion: &mut Criterion) {
@@ -59,6 +61,6 @@ pub(crate) fn bench_delete_bucket_tags(criterion: &mut Criterion) {
5961
"delete_bucket_tags",
6062
criterion,
6163
|| async { Ctx2::new().await },
62-
|ctx| DeleteBucketTags::new(&ctx.client, ctx.bucket.to_owned()),
64+
|ctx| DeleteBucketTags::new(ctx.client.clone(), ctx.bucket.clone()),
6365
)
6466
}

‎benches/s3/bench_bucket_versioning.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub(crate) fn bench_get_bucket_versioning(criterion: &mut Criterion) {
2626
"get_bucket_versioning",
2727
criterion,
2828
|| async { Ctx2::new().await },
29-
|ctx| GetBucketVersioning::new(&ctx.client, ctx.bucket.to_owned()),
29+
|ctx| GetBucketVersioning::new(ctx.client.clone(), ctx.bucket.clone()),
3030
)
3131
}
3232
pub(crate) fn bench_set_bucket_versioning(criterion: &mut Criterion) {
@@ -38,7 +38,7 @@ pub(crate) fn bench_set_bucket_versioning(criterion: &mut Criterion) {
3838
criterion,
3939
|| async { Ctx2::new().await },
4040
|ctx| {
41-
SetBucketVersioning::new(&ctx.client, ctx.bucket.to_owned())
41+
SetBucketVersioning::new(ctx.client.clone(), ctx.bucket.clone())
4242
.versioning_status(VersioningStatus::Enabled)
4343
},
4444
)

‎benches/s3/bench_list_bucket.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ pub(crate) fn bench_list_buckets(criterion: &mut Criterion) {
2323
"list_buckets",
2424
criterion,
2525
|| async { Ctx2::new().await },
26-
|ctx| ListBuckets::new(&ctx.client),
26+
|ctx| ListBuckets::new(ctx.client.clone()),
2727
)
2828
}

‎benches/s3/bench_object_append.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(crate) fn bench_object_append(criterion: &mut Criterion) {
4545

4646
let offset_bytes: u64 = resp.size;
4747
AppendObject::new(
48-
&ctx.client,
48+
ctx.client.clone(),
4949
ctx.bucket.clone(),
5050
ctx.object.clone(),
5151
data1,

‎benches/s3/bench_object_copy.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(crate) fn bench_object_copy_internal(criterion: &mut Criterion) {
2727
|ctx| {
2828
let object_name_src = &ctx.object;
2929
let object_name_dst = rand_object_name();
30-
CopyObjectInternal::new(&ctx.client, ctx.bucket.clone(), object_name_dst)
30+
CopyObjectInternal::new(ctx.client.clone(), ctx.bucket.clone(), object_name_dst)
3131
.source(CopySource::new(&ctx.bucket, object_name_src).unwrap())
3232
},
3333
)

0 commit comments

Comments
 (0)