Remove dependency actix_rt

Author: pymongo

Cargo.toml

@@ -11,16 +11,14 @@ members = [
 
 [dev-dependencies]
 actix = "*"
+actix-web = "*"
 rand = "*"
 chrono = "*"
 md-5 = "*"
 rust_decimal = "*"
 bigdecimal = { version="*", features = ["serde"] }
-num-bigint = "0.2.6"
 flate2 = "*" # Rust语言主要作者alexcrichton开发的一个gzip库
-tokio = { version = "*", features = ["full"] }
-actix-web = "*"
-actix-rt = "*"
+tokio = { version = "*", features = ["macros"] }
 reqwest = { version = "*", features = ["json"] }
 serde = { version = "*", features = ["derive"] }
 serde_json = "*"

benches/bigdecimal.rs

@@ -1,6 +1,9 @@
+/*!
+BigDecimal占据内存大小和性能都远不如rust_decimal，已弃用
+本测试就是为了比较BigDecimal在运算过程中rhs和lhs都要使用指针性能才更好的特点
+*/
 #![feature(test)]
 extern crate test;
-// cargo +nightly bench --bench bigdecimal
 
 use bigdecimal::{BigDecimal, FromPrimitive};
 use std::borrow::Borrow;
@@ -198,11 +201,13 @@ fn two_mul_both_ref(bencher: &mut test::Bencher) {
 // ========================================
 
 //////////////////// 项目中的last_price比较 ////////////////////
+#[cfg(not)]
 lazy_static::lazy_static! {
   static ref MAX_RATIO: BigDecimal = BigDecimal::from_str("1.1").unwrap();
   static ref MIN_RATIO: BigDecimal = BigDecimal::from_str("0.9").unwrap();
 }
 
+#[cfg(not)]
 #[bench]
 #[ignore]
 fn last_price_lazy_static_ref(bencher: &mut test::Bencher) {
@@ -215,6 +220,7 @@ fn last_price_lazy_static_ref(bencher: &mut test::Bencher) {
     });
 }
 
+#[cfg(not)]
 #[bench]
 #[ignore]
 /*

benches/bigdecimal_vs_rust_decimal.rs

@@ -1,3 +1,4 @@
+#![cfg(not)]
 #![feature(test)]
 extern crate test;
 // cargo +nightly bench --bench bigdecimal
@@ -6,7 +7,6 @@ use rust_decimal::Decimal;
 use rust_decimal::RoundingStrategy::RoundHalfUp;
 // 两个库的Zero, One Trait都是用的同一个crate
 use bigdecimal::{BigDecimal, One, Signed, ToPrimitive, Zero};
-use num_bigint::BigInt;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 

benches/deserialize_string_enum_u8_bool.rs

@@ -1,3 +1,4 @@
+#![cfg(not)]
 #![feature(test)]
 extern crate test;
 use serde::{Deserialize, Serialize};

examples/actix_response_channel.rs

@@ -53,7 +53,7 @@ impl Handler<Messages> for MyActor {
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
     // Start MyActor in current thread
     let addr = MyActor.start();

examples/actix_ring.rs

@@ -9,7 +9,7 @@ fn main() {
 
 或者使用actix_rt的宏
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
 }
 

examples/actix_web_http_client.rs

@@ -7,7 +7,7 @@ struct Form {
     user_id: u32,
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
     http_post_echo_server().await;
 }

examples/actix_web_mut_global_data.rs

@@ -5,24 +5,24 @@ use std::sync::{Arc, Mutex};
 // FIXME Data中出现Arc会出现`Double Arc`问题，不推荐以下写法
 #[actix_web::get("/")]
 async fn count_data(counter: web::Data<Arc<Mutex<Data>>>) -> HttpResponse {
-    log::info!("before lock");
+    println!("before lock");
     let mut data = counter.lock().unwrap();
-    log::info!("after lock");
-    log::info!("before add, data={}", data.0);
+    println!("after lock");
+    println!("before add, data={}", data.0);
     data.0 += 1;
-    log::info!("after add, data={}", data.0);
+    println!("after add, data={}", data.0);
     HttpResponse::Ok().body(format!("{}", data.0))
 }
 
 // 摘抄自官方例子
 #[actix_web::get("/app_data")]
 async fn count_app_data(data: web::Data<AppData>) -> HttpResponse {
-    log::info!("before lock");
+    println!("before lock");
     let mut counter = data.0.lock().unwrap();
-    log::info!("after lock");
-    log::info!("before add, data={}", counter);
+    println!("after lock");
+    println!("before add, data={}", counter);
     *counter += 1;
-    log::info!("before add, data={}", counter);
+    println!("before add, data={}", counter);
     HttpResponse::Ok().body(format!("{}", counter))
 }
 
@@ -31,9 +31,8 @@ struct Data(pub u32);
 struct AppData(Mutex<i32>);
 
 // TODO 个人认为更好的解决方案是once_cell或actomic，如果是可变全局变量就用再套一层Mutex/RwLock
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    log4rs::init_file("config.toml/log4rs.yml", Default::default()).unwrap();
     // FIXME actix2.0版本app_data在HttpServer::new的外面(main函数作用域)中初始化才能正常使用(否则发10个请求counter可能才加到2)
     let app_data = web::Data::new(AppData(Mutex::new(0)));
     // FIXME actix2.0版本data在HttpServer::new的外面(main函数作用域)中初始化才能正常使用(否则发10个请求counter可能才加到2)

examples/actix_web_path_segement_params.rs

@@ -4,7 +4,7 @@ use actix_web::{get, test, web, App, HttpRequest, HttpResponse};
 fn path_segment_param(req: HttpRequest, path: web::Path<(u32,)>) -> HttpResponse {
     // uri: /user/123, path: None, skip: 9, segments: [("id", Segment(6, 9))]
     dbg!(req.clone());
-    println!("path.0 = {}", path.0);
+    println!("path.0 = {}", path.0.0);
     println!("&req.match_info()[\"id\"] = {}", &req.match_info()["id"]);
     println!(
         "req.match_info().query(\"id\") = {}",
@@ -23,7 +23,7 @@ async fn test_path_segment_param() {
     test::call_service(&mut app_service, req).await;
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
     test_path_segment_param().await;
 }

examples/actix_web_query_string_params.rs

@@ -32,7 +32,7 @@ async fn test_query_string_params() {
     println!("response = {:#?}", resp);
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
     test_query_string_params().await;
 }

examples/actix_web_stream_response.rs

@@ -9,7 +9,7 @@ async fn response_body() -> HttpResponse {
     HttpResponse::Ok().streaming(rx_body)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     actix_web::HttpServer::new(move || {
         actix_web::App::new()

examples/actix_web_unit_test_mock_post_request.rs

@@ -21,7 +21,7 @@ async fn test_post_form() {
     println!("response = {:#?}", resp);
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
     test_post_form().await;
 }

examples/actix_web_unit_test_string_response.rs

@@ -5,7 +5,7 @@ pub async fn get_index() -> impl Responder {
     "Hello World"
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
     let mut app_service = test::init_service(App::new().service(get_index)).await;
     let req = test::TestRequest::default().to_request();

examples/chrono_datetime.rs

@@ -1,3 +1,4 @@
+#![allow(unused_imports)]
 use chrono::{Date, Datelike, Local, NaiveTime, TimeZone, Timelike, Weekday};
 use std::ops::Add;
 

examples/const_fn.rs

@@ -0,0 +1,31 @@
+const fn gcd(x: u32, y: u32) -> u32 {
+    let (mut a, mut b) = if x > y {(x, y)} else {(y, x)};
+    let mut temp = a % b;
+    while temp != 0 {
+        a = b;
+        b = temp;
+        temp = a % b;
+    }
+    b
+}
+
+const GCD: u32 = gcd(18, 12);
+
+const fn fib(n: u32) -> u32 {
+    const fn helper(n: u32, a: u32, b: u32) -> u32 {
+        return if n <= 2 {
+            b
+        } else {
+            helper(n - 1, b, a + b)
+        }
+    }
+    helper(n, 1, 1)
+}
+
+// 1 1 2 3 5
+const FIB_5: u32 = fib(5);
+
+fn main() {
+    dbg!(GCD);
+    dbg!(FIB_5);
+}

examples/const_generic.rs

@@ -0,0 +1,36 @@
+#![feature(const_generics)]
+
+use std::mem::MaybeUninit;
+
+/**
+当前(1.49.0)常量泛型的不足
+1. T只能是整数、布尔值，也不允许使用引用(意味着不能用胖指针的字符串)
+*/
+struct Array<T, const N: usize> {
+    items: [MaybeUninit<T>; N],
+    length: usize
+}
+
+/**
+为什么常量泛型的长度会有花括号:
+[https://internals.rust-lang.org/t/lang-team-minutes-const-generics/5090](https://internals.rust-lang.org/t/lang-team-minutes-const-generics/5090)
+> Syntactically we may distinguish these expressions with braces
+两个常量表达式的typechecking是T-lang团队的主要问题，目前{N+1}和{1+N}两个常量泛型长度会不一样
+*/
+impl<T, const N: usize> Array<T, {N}> {
+    fn new() -> Self {
+        // Self {
+        //     items: [MaybeUninit<T>; N],
+        //     length: N
+        // }
+        todo!("")
+    }
+}
+
+fn main() {
+    // fn foo() -> impl ToString {
+    //     "Hello, world!"
+    // }
+    // let _: &str = foo();
+    // let a: Array<bool, 1> = Array::new();
+}

examples/generator.rs

@@ -1,5 +1,5 @@
 #![feature(generators, generator_trait)]
-use std::future::Future;
+// use std::future::Future;
 use std::ops::Generator;
 use std::pin::Pin;
 

examples/hyper_http_client.rs

@@ -1,9 +1,11 @@
+#[cfg(test)]
 use bytes::buf::BufExt;
 
 #[cfg(debug_assertions)]
 const URL: &str = "https://jsonplaceholder.typicode.com/users/1";
 
-#[tokio::test(core_threads = 1)]
+// #[tokio::test(core_threads = 1)]
+#[tokio::test]
 async fn simple_http_request() -> Result<(), Box<dyn std::error::Error>> {
     let res = hyper::Client::new()
         .get(URL.replace("https", "http").parse()?)
@@ -14,7 +16,7 @@ async fn simple_http_request() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-#[tokio::test(core_threads = 1)]
+#[tokio::test]
 async fn hyper_https_request() -> Result<(), Box<dyn std::error::Error>> {
     let https_client =
         hyper::Client::builder().build::<_, hyper::Body>(hyper_tls::HttpsConnector::new());

examples/inline_assembly_asm.rs

@@ -1,10 +1,8 @@
 #![feature(asm)]
 
-// cargo +nightly run --example inline_assembly
 fn main() {
     unsafe {
-        // asm!("NOP");
-        llvm_asm!("NOP");
+        asm!("NOP");
     }
     println!("after NOP");
 }