Finish version bump for 2018 edition

Fix minor issue in example
KongouDesu · Aug 1, 2020 · cd5ede4 · cd5ede4
1 parent 5805da1
commit cd5ede4
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 46 deletions.
diff --git a/src/api/b2_authorize_account.rs b/src/api/b2_authorize_account.rs
@@ -1,8 +1,7 @@
 use reqwest::blocking::Client;
 use base64::{encode};
-use Error;
-use serde_json;
-use handle_b2error_kinds;
+use crate::handle_b2error_kinds;
+use crate::Error;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_create_bucket.rs b/src/api/b2_create_bucket.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth, B2BucketType, BucketResult};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth, B2BucketType, BucketResult};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_delete_bucket.rs b/src/api/b2_delete_bucket.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth, BucketResult};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth, BucketResult};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_delete_file_version.rs b/src/api/b2_delete_file_version.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_get_upload_url.rs b/src/api/b2_get_upload_url.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_hide_file.rs b/src/api/b2_hide_file.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth, B2FileInfo};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth, B2FileInfo};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_list_buckets.rs b/src/api/b2_list_buckets.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth, BucketResult};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth, BucketResult};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_list_file_names.rs b/src/api/b2_list_file_names.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth, B2FileInfo};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth, B2FileInfo};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_update_bucket.rs b/src/api/b2_update_bucket.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use ::Error;
-use api::{B2Auth, B2BucketType, BucketResult};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{B2Auth, B2BucketType, BucketResult};
+use crate::handle_b2error_kinds;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]

diff --git a/src/api/b2_upload_file.rs b/src/api/b2_upload_file.rs
@@ -1,8 +1,8 @@
 use reqwest::blocking::Client;
 use reqwest::header::HeaderMap;
-use ::Error;
-use api::{UploadAuth, B2FileInfo};
-use handle_b2error_kinds;
+use crate::Error;
+use crate::api::{UploadAuth, B2FileInfo};
+use crate::handle_b2error_kinds;
 use std::io::Read;
 
 #[derive(Deserialize, Serialize, Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]

diff --git a/src/lib.rs b/src/lib.rs
@@ -10,12 +10,14 @@
 //!
 //! ## Example:
 //! ```rust
+//! # use raze::api::*;
+//! # use raze::util::*;
 //! // Authenticate, upload and delete a file
 //! let client = reqwest::blocking::ClientBuilder::new().timeout(None).build().unwrap();
 //! let auth = authenticate_from_file(&client, "credentials").unwrap();
 //! let upauth = b2_get_upload_url(&client, &auth, "bucket_id").unwrap();
 //! let file = std::fs::File::open("document.txt").unwrap();
-//! let metadata = file.metadata.unwrap();
+//! let metadata = file.metadata().unwrap();
 //! let size = metadata.len();
 //! let modf = metadata.modified().unwrap()
 //!                 .duration_since(std::time::UNIX_EPOCH).unwrap().as_secs()*1000;
@@ -30,9 +32,9 @@
 //!
 //! let reader = file;
 //! let reader = ReadHashAtEnd::wrap(reader);
-//! let reader = ReadThrottled::wrap(reader, 100);
+//! let reader = ReadThrottled::wrap(reader, 5000);
 //!
-//! let resp1 = b2_upload_file(&client, &upauth, reader, param);
+//! let resp1 = b2_upload_file(&client, &upauth, reader, param).unwrap();
 //!
 //! let resp2 = b2_delete_file_version(&client, &auth, &resp1.file_name, &resp1.file_id.unwrap());
 //! ```
@@ -130,18 +132,15 @@ impl fmt::Display for B2ApiError {
 
 #[cfg(test)]
 mod tests {
-    use Error;
-    use api::*;
-    use util::*;
-    use std::io::{BufReader, Read, Seek, SeekFrom};
-    use std::time::Duration;
+    use crate::api::*;
+    use crate::util::*;
 
     #[test]
     fn test_dev() {
         let client = reqwest::blocking::ClientBuilder::new().timeout(None).build().unwrap();
         let auth = authenticate_from_file(&client, "credentials").unwrap();
         println!("{:?}",auth);
-        let upauth = b2_get_upload_url(&client, &auth, "").unwrap();
+        let upauth = b2_get_upload_url(&client, &auth, "bucket_id").unwrap();
         println!("{:?}", upauth);
         let file = std::fs::File::open("Cargo.lock").unwrap();
         let size = file.metadata().unwrap().len();
@@ -157,7 +156,7 @@ mod tests {
 
         let reader= file;
         let reader = ReadHashAtEnd::wrap(reader);
-        let reader = ReadThrottled::wrap(reader, 100);
+        let reader = ReadThrottled::wrap(reader, 10000);
 
         let t = std::time::Instant::now();
         let resp1 = b2_upload_file(&client, &upauth, reader, param);

diff --git a/src/util/authenticate_from_file.rs b/src/util/authenticate_from_file.rs
@@ -1,8 +1,8 @@
 use reqwest::blocking::Client;
 use std::path::Path;
-use api::B2Auth;
-use Error;
-use api;
+use crate::api::B2Auth;
+use crate::Error;
+use crate::api;
 
 /// Authenticate directly from a file containing credentials
 ///

diff --git a/src/util/list_all_files.rs b/src/util/list_all_files.rs
@@ -1,7 +1,7 @@
 use reqwest::blocking::Client;
-use api::{B2Auth, B2FileInfo};
-use Error;
-use api;
+use crate::api::{B2Auth, B2FileInfo};
+use crate::Error;
+use crate::api;
 
 /// List *all* files inside a given bucket by repeating [b2_list_file_names](../api/fn.b2_list_file_names.html)
 ///