Skip to content

Commit 169fd92

Browse files
rylevrylev
authored
Even more cleanup (#859)
1 parent 34ce004 commit 169fd92

32 files changed

+97
-203
lines changed

‎sdk/data_tables/src/requests/submit_transaction_builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::{prelude::*, responses::*};
22
use azure_core::Method;
33
use azure_core::{
4-
error::{Error, ErrorKind, ResultExt},
4+
error::{Error, ErrorKind},
55
prelude::*,
66
};
77
use std::convert::TryInto;
@@ -39,7 +39,7 @@ impl<'a> SubmitTransactionBuilder<'a> {
3939

4040
self.timeout.append_to_url_query(&mut url);
4141

42-
let payload = batch.to_string().map_kind(ErrorKind::DataConversion)?;
42+
let payload = batch.to_string()?;
4343

4444
let mut request = self.partition_key_client.prepare_request(
4545
url.as_str(),

‎sdk/identity/src/refresh_token.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ pub async fn exchange(
5757
} else {
5858
return Err(
5959
ErrorKind::http_response_from_body(rsp_status.as_u16(), &rsp_body).into_error(),
60-
)
61-
.map_kind(ErrorKind::Credential);
60+
);
6261
}
6362
}
6463

‎sdk/identity/src/token_credentials/imds_managed_identity_credentials.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ impl TokenCredential for ImdsManagedIdentityCredential {
142142
return Err(
143143
ErrorKind::http_response_from_body(rsp_status, &rsp_body).into_error()
144144
)
145-
.map_kind(ErrorKind::Credential)
146145
}
147146
}
148147
}

‎sdk/storage/src/core/parsing_xml.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ pub fn traverse<'a>(
4848
path,
4949
ignore_empty_leaf
5050
);
51-
// debug!("path.len() == {:?}", path.len());
5251

5352
if path.is_empty() {
5453
return Ok(vec![node]);
@@ -57,8 +56,6 @@ pub fn traverse<'a>(
5756
let mut curnode = node;
5857

5958
for (x, item) in path.iter().enumerate() {
60-
// debug!("x == {}, path[x] == {}", x, path[x]);
61-
6259
let vec = find_subnodes(curnode, item);
6360
if vec.is_empty() {
6461
if (x + 1) >= path.len() && ignore_empty_leaf {

‎sdk/storage/src/core/xml.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use azure_core::error::{Error, ErrorKind, ResultExt};
1+
use azure_core::error::{ErrorKind, ResultExt};
22

33
/// The UTF8 [byte order marker](https://en.wikipedia.org/wiki/Byte_order_mark)
44
const UTF8_BOM: [u8; 3] = [0xEF, 0xBB, 0xBF];
55

66
/// Reads the XML from bytes.
7-
pub fn read_xml<'de, T: serde::de::Deserialize<'de>>(body: &[u8]) -> Result<T, Error> {
7+
pub fn read_xml<'de, T: serde::de::Deserialize<'de>>(body: &[u8]) -> azure_core::Result<T> {
88
serde_xml_rs::from_reader(slice_bom(body))
99
.context(ErrorKind::DataConversion, "failed to deserialize xml")
1010
}

‎sdk/storage_blobs/src/blob/operations/put_block.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
use crate::prelude::*;
2-
use azure_core::{
3-
error::{ErrorKind, ResultExt},
4-
headers::*,
5-
prelude::*,
6-
RequestId,
7-
};
2+
use azure_core::{headers::*, prelude::*, RequestId};
83
use azure_storage::{headers::consistency_from_headers, ConsistencyCRC64, ConsistencyMD5};
94
use bytes::Bytes;
105
use chrono::{DateTime, Utc};
@@ -74,8 +69,7 @@ pub struct PutBlockResponse {
7469

7570
impl PutBlockResponse {
7671
pub(crate) fn from_headers(headers: &Headers) -> azure_core::Result<PutBlockResponse> {
77-
let (content_md5, content_crc64) =
78-
consistency_from_headers(headers).map_kind(ErrorKind::DataConversion)?;
72+
let (content_md5, content_crc64) = consistency_from_headers(headers)?;
7973
let request_id = request_id_from_headers(headers)?;
8074
let date = date_from_headers(headers)?;
8175
let request_server_encrypted = request_server_encrypted_from_headers(headers)?;

‎sdk/storage_blobs/src/blob/operations/put_block_blob.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
use crate::prelude::*;
2-
use azure_core::{
3-
error::{ErrorKind, ResultExt},
4-
headers::*,
5-
prelude::*,
6-
RequestId,
7-
};
2+
use azure_core::{headers::*, prelude::*, RequestId};
83
use azure_storage::{headers::consistency_from_headers, ConsistencyCRC64, ConsistencyMD5};
94
use bytes::Bytes;
105
use chrono::{DateTime, Utc};
@@ -105,8 +100,7 @@ impl PutBlockBlobResponse {
105100
pub fn from_headers(headers: &Headers) -> azure_core::Result<PutBlockBlobResponse> {
106101
let etag = etag_from_headers(headers)?;
107102
let last_modified = last_modified_from_headers(headers)?;
108-
let (content_md5, content_crc64) =
109-
consistency_from_headers(headers).map_kind(ErrorKind::DataConversion)?;
103+
let (content_md5, content_crc64) = consistency_from_headers(headers)?;
110104
let request_id = request_id_from_headers(headers)?;
111105
let date = date_from_headers(headers)?;
112106
let request_server_encrypted = request_server_encrypted_from_headers(headers)?;

‎sdk/storage_blobs/src/blob/operations/put_block_list.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
use crate::prelude::*;
2-
use azure_core::{
3-
error::{ErrorKind, ResultExt},
4-
headers::*,
5-
prelude::*,
6-
RequestId,
7-
};
2+
use azure_core::{headers::*, prelude::*, RequestId};
83
use azure_storage::{headers::content_md5_from_headers, ConsistencyMD5};
94
use bytes::Bytes;
105
use chrono::{DateTime, Utc};
@@ -115,7 +110,7 @@ impl PutBlockListResponse {
115110
pub(crate) fn from_headers(headers: &Headers) -> azure_core::Result<PutBlockListResponse> {
116111
let etag = etag_from_headers(headers)?;
117112
let last_modified = last_modified_from_headers(headers)?;
118-
let content_md5 = content_md5_from_headers(headers).map_kind(ErrorKind::DataConversion)?;
113+
let content_md5 = content_md5_from_headers(headers)?;
119114
let request_id = request_id_from_headers(headers)?;
120115
let date = date_from_headers(headers)?;
121116
let request_server_encrypted = request_server_encrypted_from_headers(headers)?;

‎sdk/storage_blobs/src/blob/operations/update_page.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
use crate::{prelude::*, BA512Range};
2-
use azure_core::{
3-
error::{ErrorKind, ResultExt},
4-
headers::*,
5-
prelude::*,
6-
RequestId,
7-
};
2+
use azure_core::{headers::*, prelude::*, RequestId};
83
use azure_storage::{headers::content_md5_from_headers, ConsistencyMD5};
94
use bytes::Bytes;
105
use chrono::{DateTime, Utc};
@@ -93,7 +88,7 @@ impl UpdatePageResponse {
9388
pub(crate) fn from_headers(headers: &Headers) -> azure_core::Result<UpdatePageResponse> {
9489
let etag = etag_from_headers(headers)?;
9590
let last_modified = last_modified_from_headers(headers)?;
96-
let content_md5 = content_md5_from_headers(headers).map_kind(ErrorKind::DataConversion)?;
91+
let content_md5 = content_md5_from_headers(headers)?;
9792
let sequence_number = sequence_number_from_headers(headers)?;
9893
let request_id = request_id_from_headers(headers)?;
9994
let date = date_from_headers(headers)?;

‎sdk/storage_blobs/src/container/mod.rs

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -124,39 +124,19 @@ impl Container {
124124
}
125125

126126
fn parse(elem: &Element) -> azure_core::Result<Container> {
127-
let name = cast_must::<String>(elem, &["Name"]).map_kind(ErrorKind::DataConversion)?;
128-
let last_modified = cast_must::<DateTime<Utc>>(elem, &["Properties", "Last-Modified"])
129-
.map_kind(ErrorKind::DataConversion)?;
130-
let e_tag = cast_must::<String>(elem, &["Properties", "Etag"])
131-
.map_kind(ErrorKind::DataConversion)?;
132-
133-
let lease_state = cast_must::<LeaseState>(elem, &["Properties", "LeaseState"])
134-
.map_kind(ErrorKind::DataConversion)?;
135-
136-
let lease_duration = cast_optional::<LeaseDuration>(elem, &["Properties", "LeaseDuration"])
137-
.map_kind(ErrorKind::DataConversion)?;
138-
139-
let lease_status = cast_must::<LeaseStatus>(elem, &["Properties", "LeaseStatus"])
140-
.map_kind(ErrorKind::DataConversion)?;
141-
127+
let name = cast_must(elem, &["Name"]).map_kind(ErrorKind::DataConversion)?;
128+
let last_modified = cast_must(elem, &["Properties", "Last-Modified"])?;
129+
let e_tag = cast_must(elem, &["Properties", "Etag"])?;
130+
let lease_state = cast_must(elem, &["Properties", "LeaseState"])?;
131+
let lease_duration = cast_optional(elem, &["Properties", "LeaseDuration"])?;
132+
let lease_status = cast_must(elem, &["Properties", "LeaseStatus"])?;
142133
let public_access =
143-
match cast_optional::<PublicAccess>(elem, &["Properties", "PublicAccess"])
144-
.map_kind(ErrorKind::DataConversion)?
145-
{
146-
Some(pa) => pa,
147-
None => PublicAccess::None,
148-
};
149-
150-
let has_immutability_policy =
151-
cast_must::<bool>(elem, &["Properties", "HasImmutabilityPolicy"])
152-
.map_kind(ErrorKind::DataConversion)?;
153-
let has_legal_hold = cast_must::<bool>(elem, &["Properties", "HasLegalHold"])
154-
.map_kind(ErrorKind::DataConversion)?;
155-
134+
cast_optional(elem, &["Properties", "PublicAccess"])?.unwrap_or(PublicAccess::None);
135+
let has_immutability_policy = cast_must(elem, &["Properties", "HasImmutabilityPolicy"])?;
136+
let has_legal_hold = cast_must(elem, &["Properties", "HasLegalHold"])?;
156137
let metadata = {
157138
let mut hm = HashMap::new();
158-
let metadata =
159-
traverse(elem, &["Metadata"], true).map_kind(ErrorKind::DataConversion)?;
139+
let metadata = traverse(elem, &["Metadata"], true)?;
160140

161141
for m in metadata {
162142
for key in &m.children {
@@ -170,18 +150,18 @@ impl Container {
170150
}
171151
};
172152

173-
let key = elem.name.to_owned();
174-
175153
if elem.children.is_empty() {
176154
return Err(Error::message(
177155
ErrorKind::DataConversion,
178156
"Metadata node should not be empty",
179157
));
180158
}
181159

160+
let key = elem.name.clone();
161+
182162
let content = {
183-
match elem.children[0] {
184-
Xml::CharacterNode(ref content) => content.to_owned(),
163+
match &elem.children[0] {
164+
Xml::CharacterNode(content) => content.clone(),
185165
_ => {
186166
return Err(Error::message(ErrorKind::DataConversion,
187167
"Metadata node should contain a CharacterNode with metadata value",

0 commit comments

Comments
 (0)