Skip to content

Commit 3d3d64c

Browse files
committed
code review update
1 parent 79ed8e8 commit 3d3d64c

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/s3/builders/bucket_common.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515

1616
use std::marker::PhantomData;
1717

18-
use crate::s3::{
19-
client::Client,
20-
error::Error,
21-
utils::{check_bucket_name, Multimap},
22-
};
18+
use crate::s3::{client::Client, utils::Multimap};
2319

2420
#[derive(Clone, Debug, Default)]
2521
pub struct BucketCommon<A> {
@@ -34,12 +30,11 @@ pub struct BucketCommon<A> {
3430
}
3531

3632
impl<A: Default> BucketCommon<A> {
37-
pub fn new(bucket: &str) -> Result<BucketCommon<A>, Error> {
38-
check_bucket_name(bucket, true)?;
39-
Ok(BucketCommon {
33+
pub fn new(bucket: &str) -> BucketCommon<A> {
34+
BucketCommon {
4035
bucket: bucket.to_owned(),
4136
..Default::default()
42-
})
37+
}
4338
}
4439

4540
pub fn client(mut self, client: &Client) -> Self {

src/s3/client/get_bucket_encryption.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
use super::Client;
1919
use crate::s3::builders::GetBucketEncryption;
2020
use crate::s3::error::Error;
21+
use crate::s3::utils::check_bucket_name;
2122

2223
impl Client {
2324
/// Create a GetBucketEncryption request builder.
2425
pub fn get_bucket_encryption(&self, bucket: &str) -> Result<GetBucketEncryption, Error> {
25-
Ok(GetBucketEncryption::new(bucket)?.client(self))
26+
check_bucket_name(bucket, true)?;
27+
Ok(GetBucketEncryption::new(bucket).client(self))
2628
}
2729
}

src/s3/client/get_bucket_versioning.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
use super::Client;
1919
use crate::s3::builders::GetBucketVersioning;
2020
use crate::s3::error::Error;
21+
use crate::s3::utils::check_bucket_name;
2122

2223
impl Client {
2324
/// Create a GetBucketVersioning request builder.
2425
pub fn get_bucket_versioning(&self, bucket: &str) -> Result<GetBucketVersioning, Error> {
25-
Ok(GetBucketVersioning::new(bucket)?.client(self))
26+
check_bucket_name(bucket, true)?;
27+
Ok(GetBucketVersioning::new(bucket).client(self))
2628
}
2729
}

0 commit comments

Comments
 (0)