Skip to content
This repository was archived by the owner on Oct 6, 2020. It is now read-only.

Commit 9bf2c2b

Browse files
MindFlavorMindFlavor
authored
Merge pull request #109 from MindFlavor/feat/edition_2018/pr
Migrated to Rust 2018
2 parents e52f83d + ff6dee7 commit 9bf2c2b

File tree

82 files changed

+379
-354
lines changed

Some content is hidden

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

82 files changed

+379
-354
lines changed

‎Cargo.toml

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
[package]
2-
name = "azure_sdk_for_rust"
3-
version = "0.10.1"
4-
description = "Rust wrappers around Microsoft Azure REST APIs"
5-
readme = "README.md"
6-
authors = ["Francesco Cogno <francesco.cogno@outlook.com>", "Max Gortman <mgortman@microsoft.com>", "Dong Liu <doliu@microsoft.com>"]
7-
license = "Apache-2.0"
8-
repository = "https://github.com/MindFlavor/AzureSDKForRust"
9-
documentation = "http://mindflavor.github.io/AzureSDKForRust/azure_sdk_for_rust/index.html"
10-
homepage = "https://github.com/MindFlavor/AzureSDKForRust"
2+
name = "azure_sdk_for_rust"
3+
version = "0.10.2"
4+
description = "Rust wrappers around Microsoft Azure REST APIs"
5+
readme = "README.md"
6+
authors = ["Francesco Cogno <francesco.cogno@outlook.com>", "Max Gortman <mgortman@microsoft.com>", "Dong Liu <doliu@microsoft.com>"]
7+
license = "Apache-2.0"
8+
repository = "https://github.com/MindFlavor/AzureSDKForRust"
9+
documentation = "http://mindflavor.github.io/AzureSDKForRust/azure_sdk_for_rust/index.html"
10+
homepage = "https://github.com/MindFlavor/AzureSDKForRust"
1111

12-
keywords = ["sdk", "azure", "rest", "iot", "cloud"]
13-
categories = ["api-bindings"]
12+
keywords = ["sdk", "azure", "rest", "iot", "cloud"]
13+
categories = ["api-bindings"]
14+
15+
edition = "2018"
1416

1517
[dependencies]
1618
ring = "0.13"

‎examples/stream_blob00.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fn code() -> Result<(), Box<std::error::Error>> {
7878
}
7979

8080
let returned_string = {
81-
let mut rlock = result.borrow_mut();
81+
let rlock = result.borrow();
8282
String::from_utf8(rlock.to_vec())?
8383
};
8484

‎src/azure/core/ba512_range.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use azure::core::errors::{Not512ByteAlignedError, Parse512AlignedError};
2-
use azure::core::range::Range;
1+
use crate::azure::core::errors::{Not512ByteAlignedError, Parse512AlignedError};
2+
use crate::azure::core::range::Range;
33
use std::convert::Into;
44
use std::fmt;
55
use std::str::FromStr;

‎src/azure/core/enumerations.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ macro_rules! create_enum {
7070

7171
#[cfg(test)]
7272
mod test {
73-
use azure::core::enumerations;
74-
use azure::core::errors::TraversingError;
75-
use azure::core::parsing::FromStringOptional;
73+
use crate::azure::core::enumerations;
74+
use crate::azure::core::errors::TraversingError;
75+
use crate::azure::core::parsing::FromStringOptional;
7676
use std::fmt;
7777
use std::str::FromStr;
7878

‎src/azure/core/errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::{enumerations::ParsingError, range::ParseError};
1+
use crate::azure::core::{enumerations::ParsingError, range::ParseError};
22
use base64;
33
use chrono;
44
use futures::{Future, Stream};

‎src/azure/core/lease.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use azure::core::enumerations;
2-
use azure::core::errors::TraversingError;
3-
use azure::core::parsing::FromStringOptional;
1+
use crate::azure::core::enumerations;
2+
use crate::azure::core::errors::TraversingError;
3+
use crate::azure::core::parsing::FromStringOptional;
44
use std::fmt;
55
use std::str::FromStr;
66
use uuid::Uuid;

‎src/azure/core/mod.rs

+22-19
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pub mod parsing;
99
pub mod enumerations;
1010
pub mod incompletevector;
1111
pub mod lease;
12-
use azure::core::util::HeaderMapExt;
13-
use azure::storage::client::Client;
12+
use crate::azure::core::util::HeaderMapExt;
13+
use crate::azure::storage::client::Client;
1414
use base64;
1515
use std::fmt::Debug;
1616
pub mod ba512_range;
@@ -20,7 +20,7 @@ use self::modify_conditions::{IfMatchCondition, IfSinceCondition, SequenceNumber
2020
use std::fmt;
2121
use std::str::FromStr;
2222
pub mod range;
23-
use azure::storage::blob::{BlockList, BlockListType};
23+
use crate::azure::storage::blob::{BlockList, BlockListType};
2424
use std::borrow::Borrow;
2525
use url::percent_encoding;
2626
pub mod headers;
@@ -33,9 +33,9 @@ use hyper::header::{
3333
};
3434
use uuid::Uuid;
3535
pub type RequestId = Uuid;
36-
use azure::core::errors::{AzureError, TraversingError};
37-
use azure::core::lease::LeaseId;
38-
use azure::core::parsing::FromStringOptional;
36+
use crate::azure::core::errors::{AzureError, TraversingError};
37+
use crate::azure::core::lease::LeaseId;
38+
use crate::azure::core::parsing::FromStringOptional;
3939
use http::request::Builder;
4040
use http::HeaderMap;
4141
use std::collections::HashMap;
@@ -52,9 +52,9 @@ define_encode_set! {
5252

5353
macro_rules! response_from_headers {
5454
($cn:ident, $($fh:ident -> $na:ident: $typ:ty),+) => {
55-
use azure::core::errors::AzureError;
55+
use crate::azure::core::errors::AzureError;
5656
use http::HeaderMap;
57-
use azure::core::{
57+
use crate::azure::core::{
5858
$($fh,)+
5959
};
6060

@@ -566,7 +566,7 @@ where
566566
T: Borrow<[u8]>,
567567
{
568568
type O;
569-
fn with_block_list(self, &'a BlockList<T>) -> Self::O;
569+
fn with_block_list(self, _: &'a BlockList<T>) -> Self::O;
570570
}
571571

572572
pub trait BlockListRequired<'a, T>
@@ -582,7 +582,7 @@ where
582582

583583
pub trait LeaseIdSupport<'a> {
584584
type O;
585-
fn with_lease_id(self, &'a LeaseId) -> Self::O;
585+
fn with_lease_id(self, _: &'a LeaseId) -> Self::O;
586586
}
587587

588588
pub trait LeaseIdOption<'a> {
@@ -605,7 +605,7 @@ pub trait LeaseIdRequired<'a> {
605605

606606
pub trait BodySupport<'a> {
607607
type O;
608-
fn with_body(self, &'a [u8]) -> Self::O;
608+
fn with_body(self, _: &'a [u8]) -> Self::O;
609609
}
610610

611611
pub trait BodyRequired<'a> {
@@ -614,7 +614,7 @@ pub trait BodyRequired<'a> {
614614

615615
pub trait ContentMD5Support<'a> {
616616
type O;
617-
fn with_content_md5(self, &'a [u8]) -> Self::O;
617+
fn with_content_md5(self, _: &'a [u8]) -> Self::O;
618618
}
619619

620620
pub trait ContentMD5Option<'a> {
@@ -635,7 +635,7 @@ pub(crate) fn add_content_md5_header<'a>(content_md5: &'a [u8], builder: &mut Bu
635635

636636
pub trait RangeSupport<'a> {
637637
type O;
638-
fn with_range(self, &'a range::Range) -> Self::O;
638+
fn with_range(self, _: &'a range::Range) -> Self::O;
639639
}
640640

641641
pub trait RangeOption<'a> {
@@ -658,7 +658,7 @@ pub trait RangeRequired<'a> {
658658

659659
pub trait BA512RangeSupport<'a> {
660660
type O;
661-
fn with_ba512_range(self, &'a ba512_range::BA512Range) -> Self::O;
661+
fn with_ba512_range(self, _: &'a ba512_range::BA512Range) -> Self::O;
662662
}
663663

664664
pub trait BA512RangeOption<'a> {
@@ -681,7 +681,7 @@ pub trait BA512RangeRequired<'a> {
681681

682682
pub trait LeaseDurationSupport {
683683
type O;
684-
fn with_lease_duration(self, i8) -> Self::O;
684+
fn with_lease_duration(self, _: i8) -> Self::O;
685685
}
686686

687687
pub trait LeaseDurationRequired {
@@ -694,7 +694,7 @@ pub trait LeaseDurationRequired {
694694

695695
pub trait ProposedLeaseIdSupport<'a> {
696696
type O;
697-
fn with_proposed_lease_id(self, &'a LeaseId) -> Self::O;
697+
fn with_proposed_lease_id(self, _: &'a LeaseId) -> Self::O;
698698
}
699699

700700
pub trait ProposedLeaseIdOption<'a> {
@@ -802,7 +802,8 @@ pub(crate) fn last_modified_from_headers(headers: &HeaderMap) -> Result<DateTime
802802
.ok_or_else(|| {
803803
static LM: HeaderName = LAST_MODIFIED;
804804
AzureError::HeaderNotFound(LM.as_str().to_owned())
805-
})?.to_str()?;
805+
})?
806+
.to_str()?;
806807
let last_modified = DateTime::parse_from_rfc2822(last_modified)?;
807808
let last_modified = DateTime::from_utc(last_modified.naive_utc(), Utc);
808809

@@ -816,7 +817,8 @@ pub(crate) fn date_from_headers(headers: &HeaderMap) -> Result<DateTime<Utc>, Az
816817
.ok_or_else(|| {
817818
static D: HeaderName = DATE;
818819
AzureError::HeaderNotFound(D.as_str().to_owned())
819-
})?.to_str()?;
820+
})?
821+
.to_str()?;
820822
let date = DateTime::parse_from_rfc2822(date)?;
821823
let date = DateTime::from_utc(date.naive_utc(), Utc);
822824

@@ -838,7 +840,8 @@ pub(crate) fn etag_from_headers(headers: &HeaderMap) -> Result<String, AzureErro
838840
.ok_or_else(|| {
839841
static E: HeaderName = ETAG;
840842
AzureError::HeaderNotFound(E.as_str().to_owned())
841-
})?.to_str()?
843+
})?
844+
.to_str()?
842845
.to_owned();
843846

844847
trace!("etag == {:?}", etag);

‎src/azure/core/modify_conditions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::core::headers::{IF_SEQUENCE_NUMBER_EQ, IF_SEQUENCE_NUMBER_LE, IF_SEQUENCE_NUMBER_LT};
12
use chrono::{DateTime, Utc};
2-
use core::headers::{IF_SEQUENCE_NUMBER_EQ, IF_SEQUENCE_NUMBER_LE, IF_SEQUENCE_NUMBER_LT};
33
use http::request::Builder;
44
use hyper::header::{IF_MATCH, IF_MODIFIED_SINCE, IF_NONE_MATCH, IF_UNMODIFIED_SINCE};
55

‎src/azure/core/parsing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::errors::TraversingError;
1+
use crate::azure::core::errors::TraversingError;
22
use chrono;
33
use xml::Element;
44
use xml::Xml::{CharacterNode, ElementNode};

‎src/azure/core/range.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::ba512_range::BA512Range;
1+
use crate::azure::core::ba512_range::BA512Range;
22
use std::convert::From;
33
use std::fmt;
44
use std::num::ParseIntError;

‎src/azure/core/stored_access_policy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::errors::AzureError;
1+
use crate::azure::core::errors::AzureError;
22
use chrono::{DateTime, FixedOffset};
33
use serde_xml_rs::deserialize;
44

‎src/azure/cosmos/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::{
1+
use crate::azure::core::{
22
errors::{check_status_extract_body, AzureError},
33
util::RequestBuilderExt,
44
COMPLETE_ENCODE_SET,
@@ -688,7 +688,7 @@ fn generate_resource_link(u: &str) -> &str {
688688

689689
#[cfg(test)]
690690
mod tests {
691-
use azure::cosmos::client::*;
691+
use crate::azure::cosmos::client::*;
692692

693693
#[test]
694694
fn string_to_sign_00() {

‎src/azure/cosmos/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ pub use self::client::*;
1515
pub use self::partition_key::*;
1616
pub use self::requests::*;
1717

18-
use azure::core::enumerations;
19-
use azure::core::errors::TraversingError;
20-
use azure::core::parsing::FromStringOptional;
18+
use crate::azure::core::enumerations;
19+
use crate::azure::core::errors::TraversingError;
20+
use crate::azure::core::parsing::FromStringOptional;
2121
use std::fmt;
2222
use std::str::FromStr;
2323

‎src/azure/cosmos/partition_key.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::errors::AzureError;
1+
use crate::azure::core::errors::AzureError;
22
use serde_json;
33
use smallvec::{IntoIter, SmallVec};
44
use std::borrow::Cow;

‎src/azure/cosmos/request_response.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
use azure::core::{errors::AzureError, util::HeaderMapExt};
2-
use azure::cosmos::{client::headers::HEADER_REQUEST_CHARGE, collection::Collection, database::Database, document::DocumentAttributes};
1+
use crate::azure::core::{errors::AzureError, util::HeaderMapExt};
2+
use crate::azure::cosmos::{
3+
client::headers::HEADER_REQUEST_CHARGE, collection::Collection, database::Database, document::DocumentAttributes,
4+
};
35
use serde::de::DeserializeOwned;
46

57
#[derive(Deserialize, Debug)]

‎src/azure/cosmos/requests/document_requests.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ impl ListDocumentsRequest {
302302
.map(|(da, e)| Document {
303303
document_attributes: da,
304304
entity: e,
305-
}).collect();
305+
})
306+
.collect();
306307

307308
Ok(ListDocumentsResponse {
308309
rid: document_attributes.rid,

‎src/azure/cosmos/requests/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#[allow(unused_imports)]
2-
use azure::core::{
2+
use crate::azure::core::{
33
errors::{
44
check_status_extract_body, check_status_extract_headers_and_body, extract_status_headers_and_body, AzureError, UnexpectedHTTPResult,
55
},
66
incompletevector::ContinuationToken,
77
util::RequestBuilderExt,
88
};
9-
use azure::cosmos::{
9+
use crate::azure::cosmos::{
1010
client::headers::*,
1111
document::{DocumentAttributes, IndexingDirective},
1212
partition_key::PartitionKey,

‎src/azure/service_bus/event_hub/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use futures::future::*;
22

3-
use azure::core::errors::AzureError;
4-
use azure::service_bus::event_hub::send_event;
3+
use crate::azure::core::errors::AzureError;
4+
use crate::azure::service_bus::event_hub::send_event;
55
use hyper;
66

77
use time::Duration;

‎src/azure/service_bus/event_hub/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::{
1+
use crate::azure::core::{
22
errors::{check_status_extract_body, AzureError},
33
COMPLETE_ENCODE_SET,
44
};

‎src/azure/storage/blob/blob_block_with_size.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::storage::blob::BlobBlockType;
1+
use crate::azure::storage::blob::BlobBlockType;
22
use std::borrow::Borrow;
33

44
#[derive(Debug, Clone, PartialEq)]

‎src/azure/storage/blob/blob_stream_builder.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
use azure::core::errors::AzureError;
2-
use azure::core::lease::LeaseId;
3-
use azure::core::range::Range;
4-
use azure::core::{
1+
use crate::azure::core::errors::AzureError;
2+
use crate::azure::core::lease::LeaseId;
3+
use crate::azure::core::range::Range;
4+
use crate::azure::core::{
55
BlobNameRequired, BlobNameSupport, ClientRequestIdOption, ClientRequestIdSupport, ClientRequired, ContainerNameRequired,
66
ContainerNameSupport, LeaseIdOption, LeaseIdSupport, No, RangeRequired, RangeSupport, SnapshotOption, SnapshotSupport, TimeoutOption,
77
TimeoutSupport, ToAssign, Yes,
88
};
9-
use azure::storage::blob::requests::GetBlobBuilder;
10-
use azure::storage::client::Client;
9+
use crate::azure::storage::blob::requests::GetBlobBuilder;
10+
use crate::azure::storage::client::Client;
1111
use chrono::{DateTime, Utc};
1212
use futures::prelude::*;
1313
use futures::stream;
@@ -345,7 +345,8 @@ where
345345
ContainerNameSet: ToAssign,
346346
BlobNameSet: ToAssign,
347347
RangeSet: ToAssign,
348-
{}
348+
{
349+
}
349350

350351
impl<'a> BlobStreamBuilder<'a, Yes, Yes, Yes> {
351352
#[inline]

‎src/azure/storage/blob/block_list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::storage::blob::{BlobBlockType, BlockWithSizeList};
1+
use crate::azure::storage::blob::{BlobBlockType, BlockWithSizeList};
22
use base64;
33
use std::borrow::Borrow;
44

‎src/azure/storage/blob/block_with_size_list.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use azure::core::errors::AzureError;
2-
use azure::storage::blob::BlobBlockType;
3-
use azure::storage::blob::BlobBlockWithSize;
1+
use crate::azure::core::errors::AzureError;
2+
use crate::azure::storage::blob::BlobBlockType;
3+
use crate::azure::storage::blob::BlobBlockWithSize;
44
use base64;
55
use serde_xml_rs::deserialize;
66
use std::borrow::Borrow;

‎src/azure/storage/blob/lease_blob_options.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use azure::core::lease::LeaseId;
1+
use crate::azure::core::lease::LeaseId;
22

33
#[derive(Debug, Clone, PartialEq)]
44
pub struct LeaseBlobOptions {

0 commit comments

Comments
 (0)