aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2019-11-28 04:06:55 -0500
committerJesse Luehrs <doy@tozt.net>2019-11-28 04:06:55 -0500
commitd2982f331bc9ef78d756ecea78c68f8e0cb95e55 (patch)
tree0b08b101847639f33824c0c829351b9dd5e1c497
parent312725223355e15844b73d6c4e6680b45e23a28f (diff)
downloadteleterm-d2982f331bc9ef78d756ecea78c68f8e0cb95e55.tar.gz
teleterm-d2982f331bc9ef78d756ecea78c68f8e0cb95e55.zip
fix confusing type signature
-rw-r--r--teleterm/src/oauth.rs2
-rw-r--r--teleterm/src/oauth/recurse_center.rs2
-rw-r--r--teleterm/src/server.rs4
3 files changed, 4 insertions, 4 deletions
diff --git a/teleterm/src/oauth.rs b/teleterm/src/oauth.rs
index e692a1e..894ba1d 100644
--- a/teleterm/src/oauth.rs
+++ b/teleterm/src/oauth.rs
@@ -72,7 +72,7 @@ pub trait Oauth {
}
fn get_username_from_access_token(
- self: Box<Self>,
+ &self,
token: &str,
) -> Box<dyn futures::Future<Item = String, Error = Error> + Send>;
}
diff --git a/teleterm/src/oauth/recurse_center.rs b/teleterm/src/oauth/recurse_center.rs
index c43be15..6ab41ba 100644
--- a/teleterm/src/oauth/recurse_center.rs
+++ b/teleterm/src/oauth/recurse_center.rs
@@ -46,7 +46,7 @@ impl super::Oauth for RecurseCenter {
}
fn get_username_from_access_token(
- self: Box<Self>,
+ &self,
token: &str,
) -> Box<dyn futures::Future<Item = String, Error = Error> + Send> {
let fut = reqwest::r#async::Client::new()
diff --git a/teleterm/src/server.rs b/teleterm/src/server.rs
index 28646ed..df7c3b3 100644
--- a/teleterm/src/server.rs
+++ b/teleterm/src/server.rs
@@ -451,7 +451,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
.get_access_token_from_refresh_token(
refresh_token.trim(),
)
- .and_then(|access_token| {
+ .and_then(move |access_token| {
client
.get_username_from_access_token(&access_token)
})
@@ -647,7 +647,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
let term_info = conn.state.term_info().unwrap().clone();
let fut = client
.get_access_token_from_auth_code(code)
- .and_then(|access_token| {
+ .and_then(move |access_token| {
client.get_username_from_access_token(&access_token)
})
.map(|username| {