wip wasm reqwest

unneon · Nov 7, 2019 · adac556 · adac556
1 parent 5e202e1
commit adac556
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/unijudge-codeforces/src/lib.rs b/unijudge-codeforces/src/lib.rs
@@ -45,7 +45,7 @@ pub struct CachedAuth {
 	username: String,
 }
 
-#[async_trait]
+#[async_trait(?Send)]
 impl unijudge::Backend for Codeforces {
 	type CachedAuth = CachedAuth;
 	type Contest = Contest;
@@ -96,7 +96,7 @@ impl unijudge::Backend for Codeforces {
 			.form(&[("action", "enter"), ("csrf_token", &csrf), ("handleOrEmail", username), ("password", password), ("remember", "on")])
 			.send()
 			.await?;
-		let doc = unijudge::debris::Document::new(&resp.text().await?);
+		let doc = unijudge::debris::Document::new(resp.text().await?.as_str());
 		let login_succeeded =
 			doc.find_all(".lang-chooser a").any(|v| v.attr("href").map(|href| href.string()).ok() == Some(format!("/profile/{}", username)));
 		let wrong_password_or_handle = doc.find_all(".for__password").count() == 1;

diff --git a/unijudge/Cargo.toml b/unijudge/Cargo.toml
@@ -16,7 +16,7 @@ hex = "0.4"
 html5ever = "0.24"
 http = "0.1"
 log = "0.4"
-reqwest = { git = "https://github.com/seanmonstar/reqwest" }
+reqwest = { path = "../../reqwest" }
 scraper = { git = "https://github.com/pustaczek/scraper", default-features = false }
 selectors = "0.21"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/unijudge/src/boxed.rs b/unijudge/src/boxed.rs
@@ -18,7 +18,7 @@ pub type BoxedContestURL = URL<BoxedContest, !>;
 pub type BoxedResource = Resource<BoxedContest, BoxedTask>;
 pub type BoxedContestDetails = ContestDetails<BoxedContest>;
 
-#[async_trait]
+#[async_trait(?Send)]
 impl crate::Backend for (dyn DynamicBackend+'static) {
 	type CachedAuth = BoxedCachedAuth;
 	type Contest = BoxedContest;
@@ -114,7 +114,7 @@ impl crate::Backend for (dyn DynamicBackend+'static) {
 	}
 }
 
-#[async_trait]
+#[async_trait(?Send)]
 pub trait DynamicBackend: Send+Sync {
 	fn accepted_domainsx(&self) -> &'static [&'static str];
 	fn deconstruct_resourcex(&self, domain: &str, segments: &[&str]) -> Result<BoxedResource>;
@@ -140,7 +140,7 @@ pub trait DynamicBackend: Send+Sync {
 	fn supports_contestsx(&self) -> bool;
 }
 
-#[async_trait]
+#[async_trait(?Send)]
 impl<T> DynamicBackend for T
 where
 	T: crate::Backend,

diff --git a/unijudge/src/lib.rs b/unijudge/src/lib.rs
@@ -192,7 +192,7 @@ impl URL<(), ()> {
 	}
 }
 
-#[async_trait]
+#[async_trait(?Send)]
 pub trait Backend: Send+Sync+'static {
 	type CachedAuth: Debug+Send+Sync+'static;
 	type Contest: Debug+Send+Sync+'static;