fix(versionup): use latest oauth2 lib

It enables using std::time::Duration natively
This commit is contained in:
Sebastian Thiel
2016-01-30 14:03:03 +01:00
parent ef9e7f1bae
commit a2c6b58d5b
4 changed files with 8 additions and 8 deletions

View File

@@ -31,7 +31,7 @@ hyper = "0.7"
mime = "0.1.0"
serde = ">= 0.6.0"
serde_json = ">= 0.6.0"
yup-oauth2 = "0.5"
yup-oauth2 = ">= 0.5.4"
% for dep in cargo.get('dependencies', list()):
${dep}
% endfor

View File

@@ -772,7 +772,7 @@ else {
match req_result {
Err(err) => {
if let oauth2::Retry::After(d) = dlg.http_error(&err) {
sleep(Duration::from_millis(d.num_milliseconds() as u64));
sleep(d);
continue;
}
${delegate_finish}(false);
@@ -785,7 +785,7 @@ else {
if let oauth2::Retry::After(d) = dlg.http_failure(&res,
json::from_str(&json_err).ok(),
json::from_str(&json_err).ok()) {
sleep(Duration::from_millis(d.num_milliseconds() as u64));
sleep(d);
continue;
}
${delegate_finish}(false);

View File

@@ -184,7 +184,7 @@ help${agsuffix}:
%>\
${fake_target}:
@mkdir -p ${target_dir}
@wget -nv ${info['discoveryRestUrl']} -O ${target}
@-wget -nv ${info['discoveryRestUrl']} -O ${target}
% endfor
update-json: ${' '.join(json_api_targets)}

View File

@@ -656,7 +656,7 @@ impl<'a, A> ResumableUploadHelper<'a, A>
Some(hh) if r.status == StatusCode::PermanentRedirect => hh,
None|Some(_) => {
if let Retry::After(d) = self.delegate.http_failure(&r, None, None) {
sleep(Duration::from_millis(d.num_milliseconds() as u64));
sleep(d);
continue;
}
return Err(Ok(r))
@@ -666,7 +666,7 @@ impl<'a, A> ResumableUploadHelper<'a, A>
}
Err(err) => {
if let Retry::After(d) = self.delegate.http_error(&err) {
sleep(Duration::from_millis(d.num_milliseconds() as u64));
sleep(d);
continue;
}
return Err(Err(err))
@@ -727,7 +727,7 @@ impl<'a, A> ResumableUploadHelper<'a, A>
if let Retry::After(d) = self.delegate.http_failure(&res,
json::from_str(&json_err).ok(),
json::from_str(&json_err).ok()) {
sleep(Duration::from_millis(d.num_milliseconds() as u64));
sleep(d);
continue;
}
}
@@ -735,7 +735,7 @@ impl<'a, A> ResumableUploadHelper<'a, A>
},
Err(err) => {
if let Retry::After(d) = self.delegate.http_error(&err) {
sleep(Duration::from_millis(d.num_milliseconds() as u64));
sleep(d);
continue;
}
return Some(Err(err))