From 7480a9c0a0e432169d6c300adb50276f21a54eb7 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Fri, 7 Feb 2020 19:44:21 -0800 Subject: [PATCH] Regenerated version with newer reqwest. --- Cargo.toml | 2 +- src/lib.rs | 142 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 99 insertions(+), 45 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5ff3367..b70ab4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ publish = false serde = { version = "1", features = ["derive"] } serde_json = "1" chrono = { version = "0.4", features = ["serde"] } -reqwest = { version = "0.9", default-features = false, features = ['rustls-tls'] } +reqwest = { version = "0.10", default-features = false, features = ['rustls-tls', 'blocking', 'json'] } google_field_selector = { git = "https://github.com/google-apis-rs/generator" } google_api_auth = { git = "https://github.com/google-apis-rs/generator" } mime = "0.3" diff --git a/src/lib.rs b/src/lib.rs index 8e66b20..f4b58c1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2669,7 +2669,7 @@ pub mod params { } } pub struct Client { - reqwest: ::reqwest::Client, + reqwest: ::reqwest::blocking::Client, auth: Box, } impl Client { @@ -2679,10 +2679,13 @@ impl Client { { Client::with_reqwest_client( auth, - ::reqwest::Client::builder().timeout(None).build().unwrap(), + ::reqwest::blocking::Client::builder() + .timeout(None) + .build() + .unwrap(), ) } - pub fn with_reqwest_client(auth: A, reqwest: ::reqwest::Client) -> Self + pub fn with_reqwest_client(auth: A, reqwest: ::reqwest::blocking::Client) -> Self where A: Into>, { @@ -2720,7 +2723,7 @@ pub mod resources { pub mod albums { pub mod params {} pub struct AlbumsActions<'a> { - pub(crate) reqwest: &'a reqwest::Client, + pub(crate) reqwest: &'a reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, } impl<'a> AlbumsActions<'a> { @@ -2913,7 +2916,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::add_enrichment()](struct.AlbumsActions.html#method.add_enrichment)"] #[derive(Debug, Clone)] pub struct AddEnrichmentRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::AddEnrichmentToAlbumRequest, album_id: String, @@ -3045,7 +3048,10 @@ pub mod resources { output.push_str(":addEnrichment"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -3069,7 +3075,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::batch_add_media_items()](struct.AlbumsActions.html#method.batch_add_media_items)"] #[derive(Debug, Clone)] pub struct BatchAddMediaItemsRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::BatchAddMediaItemsToAlbumRequest, album_id: String, @@ -3203,7 +3209,10 @@ pub mod resources { output.push_str(":batchAddMediaItems"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -3227,7 +3236,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::batch_remove_media_items()](struct.AlbumsActions.html#method.batch_remove_media_items)"] #[derive(Debug, Clone)] pub struct BatchRemoveMediaItemsRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::BatchRemoveMediaItemsFromAlbumRequest, album_id: String, @@ -3361,7 +3370,10 @@ pub mod resources { output.push_str(":batchRemoveMediaItems"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -3385,7 +3397,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::create()](struct.AlbumsActions.html#method.create)"] #[derive(Debug, Clone)] pub struct CreateRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::CreateAlbumRequest, access_token: Option, @@ -3506,7 +3518,10 @@ pub mod resources { output.push_str("v1/albums"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -3530,7 +3545,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::get()](struct.AlbumsActions.html#method.get)"] #[derive(Debug, Clone)] pub struct GetRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, album_id: String, access_token: Option, @@ -3657,7 +3672,10 @@ pub mod resources { } output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::GET, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -3681,7 +3699,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::list()](struct.AlbumsActions.html#method.list)"] #[derive(Debug, Clone)] pub struct ListRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, exclude_non_app_created_data: Option, page_size: Option, @@ -3918,7 +3936,10 @@ pub mod resources { output.push_str("v1/albums"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::GET, path); let req = req.query(&[( "excludeNonAppCreatedData", @@ -3959,7 +3980,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::share()](struct.AlbumsActions.html#method.share)"] #[derive(Debug, Clone)] pub struct ShareRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::ShareAlbumRequest, album_id: String, @@ -4091,7 +4112,10 @@ pub mod resources { output.push_str(":share"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -4115,7 +4139,7 @@ pub mod resources { #[doc = "Created via [AlbumsActions::unshare()](struct.AlbumsActions.html#method.unshare)"] #[derive(Debug, Clone)] pub struct UnshareRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::UnshareAlbumRequest, album_id: String, @@ -4247,7 +4271,10 @@ pub mod resources { output.push_str(":unshare"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -4272,7 +4299,7 @@ pub mod resources { pub mod media_items { pub mod params {} pub struct MediaItemsActions<'a> { - pub(crate) reqwest: &'a reqwest::Client, + pub(crate) reqwest: &'a reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, } impl<'a> MediaItemsActions<'a> { @@ -4385,7 +4412,7 @@ pub mod resources { #[doc = "Created via [MediaItemsActions::batch_create()](struct.MediaItemsActions.html#method.batch_create)"] #[derive(Debug, Clone)] pub struct BatchCreateRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::BatchCreateMediaItemsRequest, access_token: Option, @@ -4508,7 +4535,10 @@ pub mod resources { output.push_str("v1/mediaItems:batchCreate"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -4532,7 +4562,7 @@ pub mod resources { #[doc = "Created via [MediaItemsActions::batch_get()](struct.MediaItemsActions.html#method.batch_get)"] #[derive(Debug, Clone)] pub struct BatchGetRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, media_item_ids: Option>, access_token: Option, @@ -4659,7 +4689,10 @@ pub mod resources { output.push_str("v1/mediaItems:batchGet"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::GET, path); let req = req.query(&[("mediaItemIds", &self.media_item_ids)]); let req = req.query(&[("access_token", &self.access_token)]); @@ -4684,7 +4717,7 @@ pub mod resources { #[doc = "Created via [MediaItemsActions::get()](struct.MediaItemsActions.html#method.get)"] #[derive(Debug, Clone)] pub struct GetRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, media_item_id: String, access_token: Option, @@ -4813,7 +4846,10 @@ pub mod resources { } output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::GET, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -4837,7 +4873,7 @@ pub mod resources { #[doc = "Created via [MediaItemsActions::list()](struct.MediaItemsActions.html#method.list)"] #[derive(Debug, Clone)] pub struct ListRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, page_size: Option, page_token: Option, @@ -5068,7 +5104,10 @@ pub mod resources { output.push_str("v1/mediaItems"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::GET, path); let req = req.query(&[("pageSize", &self.page_size)]); let req = req.query(&[("pageToken", &self.page_token)]); @@ -5105,7 +5144,7 @@ pub mod resources { #[doc = "Created via [MediaItemsActions::search()](struct.MediaItemsActions.html#method.search)"] #[derive(Debug, Clone)] pub struct SearchRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::SearchMediaItemsRequest, access_token: Option, @@ -5228,7 +5267,10 @@ pub mod resources { output.push_str("v1/mediaItems:search"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -5253,7 +5295,7 @@ pub mod resources { pub mod shared_albums { pub mod params {} pub struct SharedAlbumsActions<'a> { - pub(crate) reqwest: &'a reqwest::Client, + pub(crate) reqwest: &'a reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, } impl<'a> SharedAlbumsActions<'a> { @@ -5348,7 +5390,7 @@ pub mod resources { #[doc = "Created via [SharedAlbumsActions::get()](struct.SharedAlbumsActions.html#method.get)"] #[derive(Debug, Clone)] pub struct GetRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, share_token: String, access_token: Option, @@ -5475,7 +5517,10 @@ pub mod resources { } output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::GET, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -5499,7 +5544,7 @@ pub mod resources { #[doc = "Created via [SharedAlbumsActions::join()](struct.SharedAlbumsActions.html#method.join)"] #[derive(Debug, Clone)] pub struct JoinRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::JoinSharedAlbumRequest, access_token: Option, @@ -5622,7 +5667,10 @@ pub mod resources { output.push_str("v1/sharedAlbums:join"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -5646,7 +5694,7 @@ pub mod resources { #[doc = "Created via [SharedAlbumsActions::leave()](struct.SharedAlbumsActions.html#method.leave)"] #[derive(Debug, Clone)] pub struct LeaveRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, request: crate::schemas::LeaveSharedAlbumRequest, access_token: Option, @@ -5769,7 +5817,10 @@ pub mod resources { output.push_str("v1/sharedAlbums:leave"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::POST, path); let req = req.query(&[("access_token", &self.access_token)]); let req = req.query(&[("alt", &self.alt)]); @@ -5793,7 +5844,7 @@ pub mod resources { #[doc = "Created via [SharedAlbumsActions::list()](struct.SharedAlbumsActions.html#method.list)"] #[derive(Debug, Clone)] pub struct ListRequestBuilder<'a> { - pub(crate) reqwest: &'a ::reqwest::Client, + pub(crate) reqwest: &'a ::reqwest::blocking::Client, pub(crate) auth: &'a dyn ::google_api_auth::GetAccessToken, exclude_non_app_created_data: Option, page_size: Option, @@ -6030,7 +6081,10 @@ pub mod resources { output.push_str("v1/sharedAlbums"); output } - fn _request(&self, path: &str) -> Result<::reqwest::RequestBuilder, crate::Error> { + fn _request( + &self, + path: &str, + ) -> Result<::reqwest::blocking::RequestBuilder, crate::Error> { let req = self.reqwest.request(::reqwest::Method::GET, path); let req = req.query(&[( "excludeNonAppCreatedData", @@ -6086,9 +6140,7 @@ impl Error { match self { Error::OAuth2(_) => None, Error::JSON(err) => Some(err), - Error::Reqwest { reqwest_err, .. } => reqwest_err - .get_ref() - .and_then(|err| err.downcast_ref::<::serde_json::Error>()), + Error::Reqwest { .. } => None, Error::Other(_) => None, } } @@ -6130,7 +6182,9 @@ impl From<::reqwest::Error> for Error { /// Check the response to see if the status code represents an error. If so /// convert it into the Reqwest variant of Error. -fn error_from_response(mut response: ::reqwest::Response) -> Result<::reqwest::Response, Error> { +fn error_from_response( + response: ::reqwest::blocking::Response, +) -> Result<::reqwest::blocking::Response, Error> { match response.error_for_status_ref() { Err(reqwest_err) => { let body = response.text().ok();