feat: upgrade actix-web to 1.0

.github/workflows/ci.yml

@@ -194,7 +194,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         with:
           draft: true
-          files: 'martin*'
+          files: "martin*"
           body_path: CHANGELOG.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -2,10 +2,20 @@
 name = "martin"
 version = "0.4.1"
 authors = ["Stepan Kuzmin <to.stepan.kuzmin@gmail.com>"]
+edition = "2018"
+
+[lib]
+name = "martin"
+path = "src/lib.rs"
+
+[[bin]]
+name = "martin"
+path = "src/bin/main.rs"
 
 [dependencies]
-actix = "0.7"
-actix-web = "0.7"
+actix = "0.8"
+actix-rt = "0.2"
+actix-web = "1.0"
 docopt = "1"
 env_logger = "0.7"
 futures = "0.1"
@@ -19,4 +29,11 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 serde_yaml = "0.8"
-tilejson = "0.2"
+tilejson = "0.2"
+
+[dev-dependencies]
+criterion = "0.3"
+
+[[bench]]
+name = "server"
+harness = false

benches/server.rs

@@ -0,0 +1,37 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+
+use actix_web::dev::Service;
+use actix_web::{test, App};
+
+use martin::dev::{mock_function_sources, mock_state, mock_table_sources};
+use martin::server::router;
+
+fn criterion_benchmark(c: &mut Criterion) {
+  let state = test::run_on(|| mock_state(mock_table_sources(), mock_function_sources()));
+  let mut app = test::init_service(App::new().data(state).configure(router));
+
+  c.bench_function("/public.table_source/0/0/0.pbf", |b| {
+    b.iter(|| {
+      let req = test::TestRequest::get()
+        .uri("/public.table_source/0/0/0.pbf")
+        .to_request();
+
+      let future = test::run_on(|| app.call(req));
+      let _response = test::block_on(future).unwrap();
+    })
+  });
+
+  c.bench_function("/rpc/public.function_source/0/0/0.pbf", |b| {
+    b.iter(|| {
+      let req = test::TestRequest::get()
+        .uri("/rpc/public.function_source/0/0/0.pbf")
+        .to_request();
+
+      let future = test::run_on(|| app.call(req));
+      let _response = test::block_on(future).unwrap();
+    })
+  });
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);