update acitx to 2.0

Cargo.toml

@@ -9,7 +9,8 @@ readme = "README.md"
 repository = "https://github.com/edward-shen/bunbun"
 
 [dependencies]
-actix-web = "1.0"
+actix-web = "2.0"
+actix-rt = "1.0"
 serde = "1.0"
 serde_yaml = "0.8"
 handlebars = "2.0"

src/main.rs

@@ -67,7 +67,8 @@ pub struct State {
   renderer: Handlebars,
 }
 
-fn main() -> Result<(), BunBunError> {
+#[actix_rt::main]
+async fn main() -> Result<(), BunBunError> {
   let yaml = load_yaml!("cli.yaml");
   let matches = ClapApp::from(yaml)
     .version(crate_version!())
@@ -143,7 +144,8 @@ fn main() -> Result<(), BunBunError> {
       .service(routes::opensearch)
   })
   .bind(&conf.bind_address)?
-  .run()?;
+  .run()
+  .await?;
 
   Ok(())
 }

src/routes.rs

@@ -21,7 +21,7 @@ const FRAGMENT_ENCODE_SET: &AsciiSet = &CONTROLS
   .add(b'+');
 
 #[get("/ls")]
-pub fn list(data: Data<Arc<RwLock<State>>>) -> impl Responder {
+pub async fn list(data: Data<Arc<RwLock<State>>>) -> impl Responder {
   let data = data.read().unwrap();
   HttpResponse::Ok().body(data.renderer.render("list", &data.groups).unwrap())
 }
@@ -32,7 +32,7 @@ pub struct SearchQuery {
 }
 
 #[get("/hop")]
-pub fn hop(
+pub async fn hop(
   data: Data<Arc<RwLock<State>>>,
   query: Query<SearchQuery>,
 ) -> impl Responder {
@@ -109,7 +109,7 @@ fn resolve_hop(
 }
 
 #[get("/")]
-pub fn index(data: Data<Arc<RwLock<State>>>) -> impl Responder {
+pub async fn index(data: Data<Arc<RwLock<State>>>) -> impl Responder {
   let data = data.read().unwrap();
   HttpResponse::Ok().body(
     data
@@ -123,7 +123,7 @@ pub fn index(data: Data<Arc<RwLock<State>>>) -> impl Responder {
 }
 
 #[get("/bunbunsearch.xml")]
-pub fn opensearch(data: Data<Arc<RwLock<State>>>) -> impl Responder {
+pub async fn opensearch(data: Data<Arc<RwLock<State>>>) -> impl Responder {
   let data = data.read().unwrap();
   HttpResponse::Ok()
     .header(