Skip to content

Commit 9d112d1

Browse files
authored
Fix build errors (Azure#1613)
1 parent fa15fac commit 9d112d1

File tree

111 files changed

+61
-181
lines changed

Some content is hidden

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

111 files changed

+61
-181
lines changed

rust-toolchain.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "1.74.0"

sdk/core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/azure_core"
1111
keywords = ["sdk", "azure", "rest", "iot", "cloud"]
1212
categories = ["api-bindings"]
1313
edition = "2021"
14-
rust-version = "1.70.0"
14+
rust-version = "1.74.0"
1515

1616
[dependencies]
1717
async-trait = "0.1"

sdk/core/src/date/iso8601.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::error::{ErrorKind, ResultExt};
2-
use serde::{self, de, Deserialize, Deserializer, Serializer};
2+
use serde::{de, Deserialize, Deserializer, Serializer};
33
use time::{
44
format_description::well_known::{
55
iso8601::{Config, EncodedConfig, TimePrecision},

sdk/core/src/date/rfc1123.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::date::{parse_rfc1123, to_rfc1123};
2-
use serde::{self, de, Deserialize, Deserializer, Serializer};
2+
use serde::{de, Deserialize, Deserializer, Serializer};
33
use time::OffsetDateTime;
44

55
pub fn deserialize<'de, D>(deserializer: D) -> Result<OffsetDateTime, D::Error>

sdk/core/src/request_options/max_results.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use crate::{AppendToUrlQuery, Url};
2-
use std::convert::TryFrom;
32
use std::num::NonZeroU32;
43

54
// This type forbids zero as value.

sdk/core/src/request_options/range.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::error::{Error, ErrorKind, ResultExt};
22
use crate::headers::{self, AsHeaders, HeaderName, HeaderValue};
3-
use std::convert::From;
43
use std::fmt;
54
use std::ops::{Range as StdRange, RangeFrom};
65
use std::str::FromStr;

sdk/core/src/tokio/fs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::{
22
request::Body,
33
seekable_stream::{SeekableStream, DEFAULT_BUFFER_SIZE},
4-
setters,
54
};
65
use futures::{task::Poll, Future};
76
use std::{cmp::min, io::SeekFrom, pin::Pin, sync::Arc, task::Context};

sdk/data_cosmos/src/authorization_policy.rs

-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ fn string_to_sign(
245245
#[cfg(test)]
246246
mod tests {
247247
use super::*;
248-
use azure_core::{date, Url};
249248

250249
#[test]
251250
fn string_to_sign_00() {

sdk/data_cosmos/src/clients/collection.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use super::{DatabaseClient, UserDefinedFunctionClient};
21
use crate::clients::*;
32
use crate::operations::*;
43
use crate::resources::collection::PartitionKey;

sdk/data_cosmos/src/operations/create_database.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::Database, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
headers::{etag_from_headers, session_token_from_headers},
44
Response as HttpResponse,

sdk/data_cosmos/src/operations/create_document.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
use crate::cosmos_entity::{add_as_partition_key_header_serialized, serialize_partition_key};
22
use crate::headers::from_headers::*;
33
use crate::prelude::*;
4-
use crate::resources::document::DocumentAttributes;
54
use crate::ResourceQuota;
65
use azure_core::headers::{etag_from_headers, session_token_from_headers};
76
use azure_core::{prelude::*, StatusCode};
87
use serde::Serialize;
9-
use std::convert::TryFrom;
108
use time::OffsetDateTime;
119

1210
use azure_core::Response as HttpResponse;

sdk/data_cosmos/src/operations/create_or_replace_attachment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::Attachment, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
headers::{etag_from_headers, session_token_from_headers},
44
Response as HttpResponse, SessionToken,

sdk/data_cosmos/src/operations/create_or_replace_slug_attachment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::Attachment, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
content_type,
44
headers::{

sdk/data_cosmos/src/operations/create_or_replace_trigger.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use crate::{
2-
headers::from_headers::*, prelude::*, resources::trigger::*, resources::Trigger, ResourceQuota,
3-
};
1+
use crate::{headers::from_headers::*, prelude::*, resources::trigger::*, ResourceQuota};
42
use azure_core::{
53
headers::{etag_from_headers, session_token_from_headers},
64
Response as HttpResponse,

sdk/data_cosmos/src/operations/create_or_replace_user_defined_function.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::UserDefinedFunction, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
headers::{etag_from_headers, session_token_from_headers},
44
Response as HttpResponse,

sdk/data_cosmos/src/operations/create_stored_procedure.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::StoredProcedure, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
headers::{etag_from_headers, session_token_from_headers},
44
Response as HttpResponse,

sdk/data_cosmos/src/operations/get_attachment.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
use crate::{
2-
headers::from_headers::*, prelude::*, resources::document::IndexingDirective,
3-
resources::Attachment, ResourceQuota,
4-
};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
52
use azure_core::{
63
headers::{content_type_from_headers, etag_from_headers, session_token_from_headers},
74
prelude::*,

sdk/data_cosmos/src/operations/get_document.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use std::marker::PhantomData;
22

33
use crate::headers::from_headers::*;
44
use crate::prelude::*;
5-
use crate::resources::Document;
65
use crate::ResourceQuota;
76
use azure_core::headers::{etag_from_headers, session_token_from_headers, Headers};
87
use azure_core::{from_json, prelude::*, StatusCode};

sdk/data_cosmos/src/operations/get_partition_key_ranges.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::ResourceType};
1+
use crate::{headers::from_headers::*, prelude::*};
22
use azure_core::{
33
headers::{item_count_from_headers, session_token_from_headers},
44
prelude::*,

sdk/data_cosmos/src/operations/list_attachments.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
use crate::{
2-
headers::from_headers::*, prelude::*, resources::Attachment, resources::ResourceType,
3-
ResourceQuota,
4-
};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
52
use azure_core::{
63
headers::{
74
continuation_token_from_headers_optional, item_count_from_headers,

sdk/data_cosmos/src/operations/list_collections.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::Collection, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
headers::{continuation_token_from_headers_optional, session_token_from_headers},
44
prelude::*,

sdk/data_cosmos/src/operations/list_databases.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::Database, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
headers::{continuation_token_from_headers_optional, session_token_from_headers},
44
prelude::*,

sdk/data_cosmos/src/operations/list_documents.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
use crate::headers::from_headers::*;
22
use crate::prelude::*;
3-
use crate::resources::document::{Document, DocumentAttributes};
4-
use crate::resources::ResourceType;
53
use crate::ResourceQuota;
64
use azure_core::headers::{
75
continuation_token_from_headers_optional, item_count_from_headers, session_token_from_headers,

sdk/data_cosmos/src/operations/list_permissions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::Permission, resources::ResourceType};
1+
use crate::{headers::from_headers::*, prelude::*};
22
use azure_core::{
33
headers::{continuation_token_from_headers_optional, session_token_from_headers},
44
prelude::*,

sdk/data_cosmos/src/operations/list_stored_procedures.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
use crate::{
2-
headers::from_headers::*, prelude::*, resources::ResourceType, resources::StoredProcedure,
3-
ResourceQuota,
4-
};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
52
use azure_core::{
63
headers::{continuation_token_from_headers_optional, session_token_from_headers},
74
prelude::*,

sdk/data_cosmos/src/operations/list_triggers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{headers::from_headers::*, prelude::*, resources::ResourceType, ResourceQuota};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
22
use azure_core::{
33
headers::item_count_from_headers,
44
headers::{continuation_token_from_headers_optional, session_token_from_headers},

sdk/data_cosmos/src/operations/list_user_defined_functions.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
use crate::{
2-
headers::from_headers::*, prelude::*, resources::ResourceType, resources::UserDefinedFunction,
3-
ResourceQuota,
4-
};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
52
use azure_core::{
63
headers::{
74
continuation_token_from_headers_optional, item_count_from_headers,

sdk/data_cosmos/src/operations/list_users.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::{
22
headers::from_headers::{activity_id_from_headers, request_charge_from_headers},
33
prelude::*,
4-
resources::User,
54
};
65
use azure_core::{
76
headers::{continuation_token_from_headers_optional, session_token_from_headers},

sdk/data_cosmos/src/operations/patch_document.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use crate::{
2-
headers::from_headers::*, prelude::*, resources::document::DocumentAttributes, ResourceQuota,
3-
};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
42
use azure_core::{headers::session_token_from_headers, Response as HttpResponse, SessionToken};
53
use serde::Serialize;
64
use serde_json::Value;

sdk/data_cosmos/src/operations/query_documents.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
use crate::{
2-
headers::from_headers::*,
3-
prelude::*,
4-
resources::{document::Query, ResourceType},
5-
ResourceQuota,
6-
};
1+
use crate::{headers::from_headers::*, prelude::*, ResourceQuota};
72
use azure_core::{
83
from_json, headers,
94
headers::{

sdk/data_cosmos/src/operations/replace_document.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use crate::{
22
cosmos_entity::{add_as_partition_key_header_serialized, serialize_partition_key},
33
headers::from_headers::*,
44
prelude::*,
5-
resources::document::DocumentAttributes,
65
ResourceQuota,
76
};
87
use azure_core::{

sdk/data_cosmos/src/operations/replace_stored_procedure.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use super::CreateStoredProcedureResponse;
21
use crate::prelude::*;
32

43
operation! {

sdk/data_cosmos/src/resources/document/query.rs

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ impl Param {
7070
#[cfg(test)]
7171
mod tests {
7272
use super::*;
73-
use serde_json;
7473

7574
#[test]
7675
fn tst_query() -> azure_core::Result<()> {

sdk/data_cosmos/src/resources/permission/permission_token.rs

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ pub enum PermissionTokenParseError {
178178
#[cfg(test)]
179179
mod tests {
180180
use super::*;
181-
use std::convert::TryInto;
182181

183182
const PERMISSION: &str = r#"type=resource&ver=1&sig=m32/00W65F8ADb3psljJ0g==;v0kQGihedau1pVGGQmuPgzlEcfsYDWSdfn2kyjDc1qF1aZfPHXzIS/BFMcuZQRUr6C5c5PgiyCSwhiAgZMJne2DorfMbE/GUHmxBLjOnykLARqwn3zpZpz9b2axWtL8+qQFX81nocdEDvBVzFuobyul6QimbmeZ7D6D1K4qJT9feuJkIBfczeAp/sKaSupXEgB3qyih0rej5N6Wv14Gufohh1QTlCRIzK3FqQv4xjcY={"#;
184183

sdk/data_tables/src/entity_with_metadata.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::EntityMetadata;
22
use azure_core::CollectedResponse;
33
use serde::de::DeserializeOwned;
4-
use std::convert::TryFrom;
54

65
#[derive(Debug, Clone)]
76
pub struct EntityWithMetadata<E: DeserializeOwned> {

sdk/data_tables/src/operations/create_table.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use crate::prelude::*;
22
use azure_core::{headers::*, prelude::*, to_json, Method, Response};
33
use azure_storage::headers::CommonStorageResponseHeaders;
44
use serde::Serialize;
5-
use std::convert::TryInto;
65

76
operation! {
87
CreateTable,

sdk/data_tables/src/operations/delete_entity.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
use crate::{prelude::*, IfMatchCondition};
1+
use crate::prelude::*;
22
use azure_core::{error::Error, headers::Headers, Method, Response};
33
use azure_storage::headers::CommonStorageResponseHeaders;
4-
use std::convert::{TryFrom, TryInto};
54

65
operation! {
76
DeleteEntity,

sdk/data_tables/src/operations/delete_table.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use azure_core::{
55
Method, Response,
66
};
77
use azure_storage::headers::CommonStorageResponseHeaders;
8-
use std::convert::{TryFrom, TryInto};
98

109
operation! {
1110
DeleteTable,

sdk/data_tables/src/operations/get_entity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::prelude::*;
22
use azure_core::{headers::*, AppendToUrlQuery, Context, Etag, Method, Response};
33
use azure_storage::headers::CommonStorageResponseHeaders;
44
use serde::{de::DeserializeOwned, Deserialize, Serialize};
5-
use std::{convert::TryInto, marker::PhantomData};
5+
use std::marker::PhantomData;
66

77
#[derive(Debug, Clone)]
88
pub struct GetEntityBuilder<T> {

sdk/data_tables/src/operations/insert_entity.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
use crate::{operations::*, prelude::*};
2-
use azure_core::{
3-
error::{Error, ErrorKind},
4-
headers::*,
5-
prelude::*,
6-
Body, CollectedResponse, Context, Method,
7-
};
8-
use serde::de::DeserializeOwned;
9-
use std::{convert::TryInto, marker::PhantomData};
2+
use azure_core::{headers::*, prelude::*, Body, Method};
3+
use std::marker::PhantomData;
104

115
#[derive(Debug, Clone)]
126
pub struct InsertEntityBuilder<T> {

sdk/data_tables/src/operations/insert_or_replace_or_merge_entity.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::{operations::*, prelude::*};
2-
use azure_core::{headers::*, prelude::*, Body, CollectedResponse, Method};
3-
use std::convert::TryInto;
2+
use azure_core::{headers::*, prelude::*, Body, Method};
43

54
operation! {
65
InsertOrReplaceOrMergeEntity,

sdk/data_tables/src/operations/list_tables.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
use crate::prelude::*;
2-
use azure_core::{
3-
error::Error, headers::*, prelude::*, AppendToUrlQuery, CollectedResponse, Method, Pageable,
4-
};
2+
use azure_core::{error::Error, headers::*, prelude::*, CollectedResponse, Method, Pageable};
53
use azure_storage::headers::CommonStorageResponseHeaders;
64
use serde::{Deserialize, Serialize};
7-
use std::convert::{TryFrom, TryInto};
85

96
operation! {
107
#[stream]

sdk/data_tables/src/operations/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use azure_core::{
2727
};
2828
use azure_storage::headers::CommonStorageResponseHeaders;
2929
use serde::de::DeserializeOwned;
30-
use std::convert::{TryFrom, TryInto};
3130

3231
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
3332
pub(crate) enum InsertOperation {

sdk/data_tables/src/operations/query_entity.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ use azure_core::{
33
error::{Error, ErrorKind},
44
headers::*,
55
prelude::*,
6-
AppendToUrlQuery, CollectedResponse, Method, Pageable,
6+
CollectedResponse, Method, Pageable,
77
};
88
use azure_storage::headers::CommonStorageResponseHeaders;
99
use serde::{de::DeserializeOwned, Deserialize, Serialize};
10-
use std::convert::{TryFrom, TryInto};
1110

1211
operation! {
1312
#[stream]

sdk/data_tables/src/operations/transaction.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use azure_core::{
1010
};
1111
use azure_storage::headers::CommonStorageResponseHeaders;
1212
use serde::Serialize;
13-
use std::convert::{TryFrom, TryInto};
1413
use tracing::trace;
1514

1615
operation! {

sdk/data_tables/src/operations/update_or_merge_entity.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::{operations::*, prelude::*, IfMatchCondition};
2-
use azure_core::{headers::*, prelude::*, Body, CollectedResponse, Method};
3-
use std::convert::TryInto;
2+
use azure_core::{headers::*, prelude::*, Body, Method};
43

54
operation! {
65
UpdateOrMergeEntity,

sdk/identity/src/token_credentials/azure_cli_credentials.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use tracing::trace;
1313
#[cfg(feature = "old_azure_cli")]
1414
mod az_cli_date_format {
1515
use azure_core::error::{ErrorKind, ResultExt};
16-
use serde::{self, Deserialize, Deserializer};
16+
use serde::{Deserialize, Deserializer};
1717
use time::format_description::FormatItem;
1818
use time::macros::format_description;
1919
#[cfg(not(unix))]

sdk/identity/src/token_credentials/imds_managed_identity_credentials.rs

-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ struct MsiTokenResponse {
180180
#[cfg(test)]
181181
mod tests {
182182
use super::*;
183-
use azure_core::from_json;
184183
use time::macros::datetime;
185184

186185
#[derive(Debug, Deserialize)]

sdk/messaging_eventgrid/src/event.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use serde::{self, Serialize};
1+
use serde::Serialize;
22
use time::OffsetDateTime;
33
use uuid::Uuid;
44

@@ -64,7 +64,7 @@ where
6464
mod tests {
6565
use super::*;
6666
use azure_core::to_json;
67-
use serde::{self, Serialize};
67+
use serde::Serialize;
6868
use time::macros::datetime;
6969

7070
#[derive(Serialize)]

0 commit comments

Comments
 (0)