Skip to content

Commit b3ed924

Browse files
bmc-msftbmc-msft
authored
remove Box<dyn Error> from storage queues (#817)
1 parent 1619b67 commit b3ed924

23 files changed

+65
-82
lines changed

‎sdk/storage_queues/examples/delete_message.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#[macro_use]
22
extern crate log;
3+
use azure_core::error::Result;
34
use azure_storage::core::prelude::*;
45
use azure_storage_queues::prelude::*;
5-
use std::error::Error;
66
use std::time::Duration;
77

88
#[tokio::main]
9-
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
9+
async fn main() -> Result<()> {
1010
// First we retrieve the account name and master key from environment variables.
1111
let account =
1212
std::env::var("STORAGE_ACCOUNT").expect("Set env variable STORAGE_ACCOUNT first!");

‎sdk/storage_queues/examples/get_messages.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#[macro_use]
22
extern crate log;
3+
use azure_core::error::Result;
34
use azure_storage::core::prelude::*;
45
use azure_storage_queues::prelude::*;
5-
use std::error::Error;
66
use std::time::Duration;
77

88
#[tokio::main]
9-
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
9+
async fn main() -> Result<()> {
1010
// First we retrieve the account name and master key from environment variables.
1111
let account =
1212
std::env::var("STORAGE_ACCOUNT").expect("Set env variable STORAGE_ACCOUNT first!");

‎sdk/storage_queues/examples/list_queues.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
use azure_core::error::Result;
12
use azure_storage::core::prelude::*;
23
use azure_storage_queues::prelude::*;
34
use futures::stream::StreamExt;
4-
use std::error::Error;
55
use std::num::NonZeroU32;
66

77
#[tokio::main]
8-
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
8+
async fn main() -> Result<()> {
99
// First we retrieve the account name and master key from environment variables.
1010
let account =
1111
std::env::var("STORAGE_ACCOUNT").expect("Set env variable STORAGE_ACCOUNT first!");

‎sdk/storage_queues/examples/peek_messages.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#[macro_use]
22
extern crate log;
3+
use azure_core::error::Result;
34
use azure_storage::core::prelude::*;
45
use azure_storage_queues::prelude::*;
5-
use std::error::Error;
66

77
#[tokio::main]
8-
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
8+
async fn main() -> Result<()> {
99
// First we retrieve the account name and master key from environment variables.
1010
let account =
1111
std::env::var("STORAGE_ACCOUNT").expect("Set env variable STORAGE_ACCOUNT first!");

‎sdk/storage_queues/examples/put_message.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#[macro_use]
22
extern crate log;
3+
use azure_core::error::Result;
34
use azure_storage::core::prelude::*;
45
use azure_storage_queues::prelude::*;
5-
use std::error::Error;
66

77
#[tokio::main]
8-
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
8+
async fn main() -> Result<()> {
99
// First we retrieve the account name and master key from environment variables.
1010
let account =
1111
std::env::var("STORAGE_ACCOUNT").expect("Set env variable STORAGE_ACCOUNT first!");

‎sdk/storage_queues/examples/queue_create.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#[macro_use]
22
extern crate log;
3+
use azure_core::error::Result;
34
use azure_core::prelude::*;
45
use azure_storage::core::prelude::*;
56
use azure_storage_queues::prelude::*;
67
use chrono::{Duration, Utc};
7-
use std::error::Error;
88

99
#[tokio::main]
10-
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
10+
async fn main() -> Result<()> {
1111
// First we retrieve the account name and master key from environment variables.
1212
let account =
1313
std::env::var("STORAGE_ACCOUNT").expect("Set env variable STORAGE_ACCOUNT first!");

‎sdk/storage_queues/src/requests/clear_messages_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::clients::QueueClient;
22
use crate::responses::*;
3+
use azure_core::error::Result;
34
use azure_core::headers::add_optional_header;
45
use azure_core::prelude::*;
56
use std::convert::TryInto;
@@ -25,9 +26,7 @@ impl<'a> ClearMessagesBuilder<'a> {
2526
client_request_id: ClientRequestId => Some(client_request_id),
2627
}
2728

28-
pub async fn execute(
29-
&self,
30-
) -> Result<ClearMessagesResponse, Box<dyn std::error::Error + Sync + Send>> {
29+
pub async fn execute(&self) -> Result<ClearMessagesResponse> {
3130
let mut url = self.queue_client.url_with_segments(Some("messages"))?;
3231

3332
self.timeout.append_to_url_query(&mut url);
@@ -52,6 +51,6 @@ impl<'a> ClearMessagesBuilder<'a> {
5251
.execute_request_check_status(request.0, http::status::StatusCode::NO_CONTENT)
5352
.await?;
5453

55-
Ok((&response).try_into()?)
54+
(&response).try_into()
5655
}
5756
}

‎sdk/storage_queues/src/requests/create_queue_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::clients::QueueClient;
22
use crate::responses::*;
3+
use azure_core::error::Result;
34
use azure_core::headers::{add_mandatory_header, add_optional_header};
45
use azure_core::prelude::*;
56
use std::convert::TryInto;
@@ -28,9 +29,7 @@ impl<'a> CreateQueueBuilder<'a> {
2829
client_request_id: ClientRequestId => Some(client_request_id),
2930
}
3031

31-
pub async fn execute(
32-
&self,
33-
) -> Result<CreateQueueResponse, Box<dyn std::error::Error + Sync + Send>> {
32+
pub async fn execute(&self) -> Result<CreateQueueResponse> {
3433
let mut url = self.queue_client.url_with_segments(None)?;
3534

3635
self.timeout.append_to_url_query(&mut url);
@@ -58,6 +57,6 @@ impl<'a> CreateQueueBuilder<'a> {
5857
.execute_request_check_status(request.0, http::status::StatusCode::CREATED)
5958
.await?;
6059

61-
Ok((&response).try_into()?)
60+
(&response).try_into()
6261
}
6362
}

‎sdk/storage_queues/src/requests/delete_message_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::clients::PopReceiptClient;
22
use crate::responses::*;
3+
use azure_core::error::Result;
34
use azure_core::headers::add_optional_header;
45
use azure_core::prelude::*;
56
use std::convert::TryInto;
@@ -25,9 +26,7 @@ impl<'a> DeleteMessageBuilder<'a> {
2526
client_request_id: ClientRequestId => Some(client_request_id),
2627
}
2728

28-
pub async fn execute(
29-
&self,
30-
) -> Result<DeleteMessageResponse, Box<dyn std::error::Error + Sync + Send>> {
29+
pub async fn execute(&self) -> Result<DeleteMessageResponse> {
3130
let mut url = self.pop_receipt_client.pop_receipt_url()?;
3231

3332
self.timeout.append_to_url_query(&mut url);
@@ -50,6 +49,6 @@ impl<'a> DeleteMessageBuilder<'a> {
5049
.execute_request_check_status(request.0, http::status::StatusCode::NO_CONTENT)
5150
.await?;
5251

53-
Ok((&response).try_into()?)
52+
(&response).try_into()
5453
}
5554
}

‎sdk/storage_queues/src/requests/delete_queue_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::clients::QueueClient;
22
use crate::responses::*;
3+
use azure_core::error::Result;
34
use azure_core::headers::add_optional_header;
45
use azure_core::prelude::*;
56
use std::convert::TryInto;
@@ -25,9 +26,7 @@ impl<'a> DeleteQueueBuilder<'a> {
2526
client_request_id: ClientRequestId => Some(client_request_id),
2627
}
2728

28-
pub async fn execute(
29-
&self,
30-
) -> Result<DeleteQueueResponse, Box<dyn std::error::Error + Sync + Send>> {
29+
pub async fn execute(&self) -> Result<DeleteQueueResponse> {
3130
let mut url = self.queue_client.url_with_segments(None)?;
3231

3332
self.timeout.append_to_url_query(&mut url);
@@ -50,6 +49,6 @@ impl<'a> DeleteQueueBuilder<'a> {
5049
.execute_request_check_status(request.0, http::status::StatusCode::NO_CONTENT)
5150
.await?;
5251

53-
Ok((&response).try_into()?)
52+
(&response).try_into()
5453
}
5554
}

‎sdk/storage_queues/src/requests/get_messages_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::clients::QueueClient;
22
use crate::prelude::*;
33
use crate::responses::*;
4+
use azure_core::error::Result;
45
use azure_core::headers::add_optional_header;
56
use azure_core::prelude::*;
67
use std::convert::TryInto;
@@ -32,9 +33,7 @@ impl<'a> GetMessagesBuilder<'a> {
3233
client_request_id: ClientRequestId => Some(client_request_id),
3334
}
3435

35-
pub async fn execute(
36-
&self,
37-
) -> Result<GetMessagesResponse, Box<dyn std::error::Error + Sync + Send>> {
36+
pub async fn execute(&self) -> Result<GetMessagesResponse> {
3837
let mut url = self.queue_client.url_with_segments(Some("messages"))?;
3938

4039
self.visibility_timeout.append_to_url_query(&mut url);
@@ -61,6 +60,6 @@ impl<'a> GetMessagesBuilder<'a> {
6160
.execute_request_check_status(request.0, http::status::StatusCode::OK)
6261
.await?;
6362

64-
Ok((&response).try_into()?)
63+
(&response).try_into()
6564
}
6665
}

‎sdk/storage_queues/src/requests/get_queue_acl_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::clients::QueueClient;
22
use crate::responses::*;
3+
use azure_core::error::Result;
34
use azure_core::headers::add_optional_header;
45
use azure_core::prelude::*;
56
use http::method::Method;
@@ -27,9 +28,7 @@ impl<'a> GetQueueACLBuilder<'a> {
2728
client_request_id: ClientRequestId => Some(client_request_id),
2829
}
2930

30-
pub async fn execute(
31-
&self,
32-
) -> Result<GetQueueACLResponse, Box<dyn std::error::Error + Sync + Send>> {
31+
pub async fn execute(&self) -> Result<GetQueueACLResponse> {
3332
let mut url = self.queue_client.url_with_segments(None)?;
3433

3534
url.query_pairs_mut().append_pair("comp", "acl");
@@ -56,6 +55,6 @@ impl<'a> GetQueueACLBuilder<'a> {
5655
.execute_request_check_status(request.0, StatusCode::OK)
5756
.await?;
5857

59-
Ok((&response).try_into()?)
58+
(&response).try_into()
6059
}
6160
}

‎sdk/storage_queues/src/requests/get_queue_metadata_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::clients::QueueClient;
22
use crate::responses::*;
3+
use azure_core::error::Result;
34
use azure_core::headers::add_optional_header;
45
use azure_core::prelude::*;
56
use http::method::Method;
@@ -27,9 +28,7 @@ impl<'a> GetQueueMetadataBuilder<'a> {
2728
client_request_id: ClientRequestId => Some(client_request_id),
2829
}
2930

30-
pub async fn execute(
31-
&self,
32-
) -> Result<GetQueueMetadataResponse, Box<dyn std::error::Error + Sync + Send>> {
31+
pub async fn execute(&self) -> Result<GetQueueMetadataResponse> {
3332
let mut url = self.queue_client.url_with_segments(None)?;
3433

3534
url.query_pairs_mut().append_pair("comp", "metadata");
@@ -56,6 +55,6 @@ impl<'a> GetQueueMetadataBuilder<'a> {
5655
.execute_request_check_status(request.0, StatusCode::OK)
5756
.await?;
5857

59-
Ok((&response).try_into()?)
58+
(&response).try_into()
6059
}
6160
}

‎sdk/storage_queues/src/requests/get_queue_service_properties_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use crate::responses::*;
2+
use azure_core::error::Result;
23
use azure_core::headers::add_optional_header;
34
use azure_core::prelude::*;
45
use azure_storage::core::prelude::*;
@@ -27,9 +28,7 @@ impl<'a> GetQueueServicePropertiesBuilder<'a> {
2728
client_request_id: ClientRequestId => Some(client_request_id),
2829
}
2930

30-
pub async fn execute(
31-
&self,
32-
) -> Result<GetQueueServicePropertiesResponse, Box<dyn std::error::Error + Sync + Send>> {
31+
pub async fn execute(&self) -> Result<GetQueueServicePropertiesResponse> {
3332
let mut url = self
3433
.storage_client
3534
.storage_account_client()
@@ -60,6 +59,6 @@ impl<'a> GetQueueServicePropertiesBuilder<'a> {
6059
.execute_request_check_status(request.0, StatusCode::OK)
6160
.await?;
6261

63-
Ok((&response).try_into()?)
62+
(&response).try_into()
6463
}
6564
}

‎sdk/storage_queues/src/requests/get_queue_service_stats_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use crate::responses::*;
2+
use azure_core::error::Result;
23
use azure_core::headers::add_optional_header;
34
use azure_core::prelude::*;
45
use azure_storage::core::prelude::*;
@@ -27,9 +28,7 @@ impl<'a> GetQueueServiceStatsBuilder<'a> {
2728
client_request_id: ClientRequestId => Some(client_request_id),
2829
}
2930

30-
pub async fn execute(
31-
&self,
32-
) -> Result<GetQueueServiceStatsResponse, Box<dyn std::error::Error + Sync + Send>> {
31+
pub async fn execute(&self) -> Result<GetQueueServiceStatsResponse> {
3332
let mut url = self
3433
.storage_client
3534
.storage_account_client()
@@ -60,6 +59,6 @@ impl<'a> GetQueueServiceStatsBuilder<'a> {
6059
.execute_request_check_status(request.0, StatusCode::OK)
6160
.await?;
6261

63-
Ok((&response).try_into()?)
62+
(&response).try_into()
6463
}
6564
}

‎sdk/storage_queues/src/requests/list_queues_builder.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use crate::responses::*;
2+
use azure_core::error::Result;
23
use azure_core::headers::add_optional_header;
34
use azure_core::prelude::*;
45
use azure_storage::core::prelude::*;
@@ -40,9 +41,7 @@ impl<'a> ListQueuesBuilder<'a> {
4041
client_request_id: ClientRequestId => Some(client_request_id),
4142
}
4243

43-
pub async fn execute(
44-
&self,
45-
) -> Result<ListQueuesResponse, Box<dyn std::error::Error + Sync + Send>> {
44+
pub async fn execute(&self) -> Result<ListQueuesResponse> {
4645
let mut url = self
4746
.storage_client
4847
.storage_account_client()
@@ -81,13 +80,10 @@ impl<'a> ListQueuesBuilder<'a> {
8180
.execute_request_check_status(request.0, StatusCode::OK)
8281
.await?;
8382

84-
Ok((&response).try_into()?)
83+
(&response).try_into()
8584
}
8685

87-
pub fn stream(
88-
self,
89-
) -> impl Stream<Item = Result<ListQueuesResponse, Box<dyn std::error::Error + Sync + Send>>> + 'a
90-
{
86+
pub fn stream(self) -> impl Stream<Item = Result<ListQueuesResponse>> + 'a {
9187
#[derive(Debug, Clone, PartialEq)]
9288
enum States {
9389
Init,

‎sdk/storage_queues/src/requests/peek_messages_builder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::clients::QueueClient;
22
use crate::prelude::*;
33
use crate::responses::*;
4+
use azure_core::error::Result;
45
use azure_core::headers::add_optional_header;
56
use azure_core::prelude::*;
67
use std::convert::TryInto;
@@ -29,9 +30,7 @@ impl<'a> PeekMessagesBuilder<'a> {
2930
client_request_id: ClientRequestId => Some(client_request_id),
3031
}
3132

32-
pub async fn execute(
33-
&self,
34-
) -> Result<PeekMessagesResponse, Box<dyn std::error::Error + Sync + Send>> {
33+
pub async fn execute(&self) -> Result<PeekMessagesResponse> {
3534
let mut url = self.queue_client.url_with_segments(Some("messages"))?;
3635

3736
url.query_pairs_mut().append_pair("peekonly", "true");
@@ -58,6 +57,6 @@ impl<'a> PeekMessagesBuilder<'a> {
5857
.execute_request_check_status(request.0, http::status::StatusCode::OK)
5958
.await?;
6059

61-
Ok((&response).try_into()?)
60+
(&response).try_into()
6261
}
6362
}

0 commit comments

Comments
 (0)