Skip to content

Commit afbc967

Browse files
yoshuawuytsyoshuawuyts
authored
Expose crate::Result type alias for Cosmos (#338)
* Expose `crate::Result` type alias for Cosmos * migrate all remaining Result types over * cargo fmt
1 parent 5f4fdd1 commit afbc967

File tree

100 files changed

+258
-260
lines changed

Some content is hidden

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

100 files changed

+258
-260
lines changed

‎sdk/cosmos/src/clients/collection_client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl CollectionClient {
4848
&self,
4949
ctx: Context,
5050
options: GetCollectionOptions,
51-
) -> Result<GetCollectionResponse, crate::Error> {
51+
) -> crate::Result<GetCollectionResponse> {
5252
let mut request = self.prepare_request_with_collection_name(http::Method::GET);
5353

5454
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Collections.into());
@@ -70,7 +70,7 @@ impl CollectionClient {
7070
&self,
7171
ctx: Context,
7272
options: DeleteCollectionOptions,
73-
) -> Result<DeleteCollectionResponse, crate::Error> {
73+
) -> crate::Result<DeleteCollectionResponse> {
7474
let mut request = self.prepare_request_with_collection_name(http::Method::DELETE);
7575

7676
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Collections.into());
@@ -92,7 +92,7 @@ impl CollectionClient {
9292
&self,
9393
ctx: Context,
9494
options: ReplaceCollectionOptions,
95-
) -> Result<ReplaceCollectionResponse, crate::Error> {
95+
) -> crate::Result<ReplaceCollectionResponse> {
9696
let mut request = self.prepare_request_with_collection_name(http::Method::PUT);
9797

9898
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Collections.into());
@@ -120,7 +120,7 @@ impl CollectionClient {
120120
ctx: Context,
121121
document: &'a D,
122122
options: CreateDocumentOptions<'_>,
123-
) -> Result<CreateDocumentResponse, crate::Error> {
123+
) -> crate::Result<CreateDocumentResponse> {
124124
let mut request = self.prepare_doc_request_pipeline(http::Method::POST);
125125
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Documents.into());
126126

‎sdk/cosmos/src/clients/cosmos_client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl CosmosClient {
182182
ctx: Context,
183183
database_name: S,
184184
options: CreateDatabaseOptions,
185-
) -> Result<CreateDatabaseResponse, crate::Error> {
185+
) -> crate::Result<CreateDatabaseResponse> {
186186
let mut request = self.prepare_request_pipeline("dbs", http::Method::POST);
187187

188188
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Databases.into());
@@ -203,7 +203,7 @@ impl CosmosClient {
203203
&self,
204204
ctx: Context,
205205
options: ListDatabasesOptions,
206-
) -> impl Stream<Item = Result<ListDatabasesResponse, crate::Error>> + '_ {
206+
) -> impl Stream<Item = crate::Result<ListDatabasesResponse>> + '_ {
207207
macro_rules! r#try {
208208
($expr:expr $(,)?) => {
209209
match $expr {

‎sdk/cosmos/src/clients/database_client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl DatabaseClient {
4242
&self,
4343
ctx: Context,
4444
options: GetDatabaseOptions,
45-
) -> Result<GetDatabaseResponse, crate::Error> {
45+
) -> crate::Result<GetDatabaseResponse> {
4646
let mut request = self
4747
.cosmos_client()
4848
.prepare_request_pipeline(&format!("dbs/{}", self.database_name()), http::Method::GET);
@@ -75,7 +75,7 @@ impl DatabaseClient {
7575
ctx: Context,
7676
collection_name: S,
7777
options: CreateCollectionOptions,
78-
) -> Result<CreateCollectionResponse, crate::Error> {
78+
) -> crate::Result<CreateCollectionResponse> {
7979
let mut request = self.cosmos_client().prepare_request_pipeline(
8080
&format!("dbs/{}/colls", self.database_name()),
8181
http::Method::POST,
@@ -98,7 +98,7 @@ impl DatabaseClient {
9898
&self,
9999
ctx: Context,
100100
options: ListUsersOptions,
101-
) -> impl Stream<Item = Result<ListUsersResponse, crate::Error>> + '_ {
101+
) -> impl Stream<Item = crate::Result<ListUsersResponse>> + '_ {
102102
macro_rules! r#try {
103103
($expr:expr $(,)?) => {
104104
match $expr {

‎sdk/cosmos/src/clients/document_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl DocumentClient {
6767
&self,
6868
ctx: Context,
6969
options: GetDocumentOptions<'_>,
70-
) -> Result<GetDocumentResponse<T>, crate::Error>
70+
) -> crate::Result<GetDocumentResponse<T>>
7171
where
7272
T: DeserializeOwned,
7373
{

‎sdk/cosmos/src/clients/permission_client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl PermissionClient {
5050
ctx: Context,
5151
options: CreatePermissionOptions,
5252
permission_mode: &PermissionMode<'_>,
53-
) -> Result<PermissionResponse<'_>, crate::Error> {
53+
) -> crate::Result<PermissionResponse<'_>> {
5454
let mut request = self.cosmos_client().prepare_request_pipeline(
5555
&format!(
5656
"dbs/{}/users/{}/permissions",
@@ -80,7 +80,7 @@ impl PermissionClient {
8080
ctx: Context,
8181
options: ReplacePermissionOptions,
8282
permission_mode: &PermissionMode<'_>,
83-
) -> Result<PermissionResponse<'_>, crate::Error> {
83+
) -> crate::Result<PermissionResponse<'_>> {
8484
let mut request = self.prepare_request_with_permission_name(http::Method::PUT);
8585

8686
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Permissions.into());
@@ -102,7 +102,7 @@ impl PermissionClient {
102102
&self,
103103
ctx: Context,
104104
options: GetPermissionOptions,
105-
) -> Result<PermissionResponse<'_>, crate::Error> {
105+
) -> crate::Result<PermissionResponse<'_>> {
106106
let mut request = self.prepare_request_with_permission_name(http::Method::GET);
107107

108108
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Permissions.into());
@@ -124,7 +124,7 @@ impl PermissionClient {
124124
&self,
125125
ctx: Context,
126126
options: DeletePermissionOptions,
127-
) -> Result<DeletePermissionResponse, crate::Error> {
127+
) -> crate::Result<DeletePermissionResponse> {
128128
let mut request = self.prepare_request_with_permission_name(http::Method::DELETE);
129129

130130
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Permissions.into());

‎sdk/cosmos/src/clients/user_client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl UserClient {
4545
&self,
4646
ctx: Context,
4747
options: CreateUserOptions,
48-
) -> Result<UserResponse, crate::Error> {
48+
) -> crate::Result<UserResponse> {
4949
let mut request = self.cosmos_client().prepare_request_pipeline(
5050
&format!("dbs/{}/users", self.database_client.database_name()),
5151
http::Method::POST,
@@ -68,7 +68,7 @@ impl UserClient {
6868
&self,
6969
ctx: Context,
7070
options: GetUserOptions,
71-
) -> Result<UserResponse, crate::Error> {
71+
) -> crate::Result<UserResponse> {
7272
let mut request = self.prepare_request_with_user_name(http::Method::GET);
7373
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Users.into());
7474

@@ -89,7 +89,7 @@ impl UserClient {
8989
ctx: Context,
9090
user_name: S,
9191
options: ReplaceUserOptions,
92-
) -> Result<UserResponse, crate::Error> {
92+
) -> crate::Result<UserResponse> {
9393
let mut request = self.prepare_request_with_user_name(http::Method::PUT);
9494
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Users.into());
9595

@@ -109,7 +109,7 @@ impl UserClient {
109109
&self,
110110
ctx: Context,
111111
options: DeleteUserOptions,
112-
) -> Result<DeleteUserResponse, crate::Error> {
112+
) -> crate::Result<DeleteUserResponse> {
113113
let mut request = self.prepare_request_with_user_name(http::Method::DELETE);
114114
let mut pipeline_context = PipelineContext::new(ctx, ResourceType::Users.into());
115115

‎sdk/cosmos/src/errors.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/// A specialized Result type for Cosmos.
2+
pub type Result<T> = std::result::Result<T, Error>;
3+
14
/// An error having to do with Cosmos.
25
#[allow(missing_docs)]
36
#[non_exhaustive]

‎sdk/cosmos/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@ pub use cosmos_entity::CosmosEntity;
123123
pub use resource_quota::ResourceQuota;
124124
pub(crate) use time_nonce::TimeNonce;
125125

126-
pub use errors::Error;
126+
pub use errors::{Error, Result};
127127

128128
type ReadonlyString = std::borrow::Cow<'static, str>;

‎sdk/cosmos/src/operations/create_collection.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl CreateCollectionOptions {
3333
&self,
3434
request: &mut HttpRequest,
3535
collection_name: &str,
36-
) -> Result<(), crate::Error> {
36+
) -> crate::Result<()> {
3737
azure_core::headers::add_optional_header2(&self.offer, request)?;
3838
azure_core::headers::add_optional_header2(&self.consistency_level, request)?;
3939

@@ -76,7 +76,7 @@ pub struct CreateCollectionResponse {
7676
}
7777

7878
impl CreateCollectionResponse {
79-
pub async fn try_from(response: HttpResponse) -> Result<Self, crate::Error> {
79+
pub async fn try_from(response: HttpResponse) -> crate::Result<Self> {
8080
let (_status_code, headers, pinned_stream) = response.deconstruct();
8181
let body = collect_pinned_stream(pinned_stream).await?;
8282

‎sdk/cosmos/src/operations/create_database.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl CreateDatabaseOptions {
2828
&self,
2929
request: &mut HttpRequest,
3030
database_name: &str,
31-
) -> Result<(), crate::Error> {
31+
) -> crate::Result<()> {
3232
#[derive(Serialize)]
3333
struct CreateDatabaseRequest<'a> {
3434
pub id: &'a str,
@@ -60,7 +60,7 @@ pub struct CreateDatabaseResponse {
6060
}
6161

6262
impl CreateDatabaseResponse {
63-
pub async fn try_from(response: HttpResponse) -> Result<Self, crate::Error> {
63+
pub async fn try_from(response: HttpResponse) -> crate::Result<Self> {
6464
let (_status_code, headers, pinned_stream) = response.deconstruct();
6565
let body = collect_pinned_stream(pinned_stream).await?;
6666

0 commit comments

Comments
 (0)