Merge branch 'master' into fix-tests

This commit is contained in:
fakeshadow 2020-12-29 10:58:44 +08:00 committed by GitHub
commit 59c56d9b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 37 deletions

View File

@ -2,12 +2,10 @@ digraph {
subgraph cluster_net { subgraph cluster_net {
label="actix/actix-net"; label="actix/actix-net";
"actix-codec" "actix-codec"
"actix-connect"
"actix-macros" "actix-macros"
"actix-rt" "actix-rt"
"actix-server" "actix-server"
"actix-service" "actix-service"
"actix-testing"
"actix-threadpool" "actix-threadpool"
"actix-tls" "actix-tls"
"actix-tracing" "actix-tracing"
@ -17,9 +15,7 @@ digraph {
"actix-utils" -> { "actix-service" "actix-rt" "actix-codec" } "actix-utils" -> { "actix-service" "actix-rt" "actix-codec" }
"actix-tracing" -> { "actix-service" } "actix-tracing" -> { "actix-service" }
"actix-tls" -> { "actix-service" "actix-codec" "actix-utils" } "actix-tls" -> { "actix-service" "actix-codec" "actix-utils" "actix-rt" }
"actix-testing" -> { "actix-rt" "actix-macros" "actix-server" "actix-service" }
"actix-server" -> { "actix-service" "actix-rt" "actix-codec" "actix-utils" } "actix-server" -> { "actix-service" "actix-rt" "actix-codec" "actix-utils" }
"actix-rt" -> { "actix-macros" "actix-threadpool" } "actix-rt" -> { "actix-macros" "actix-threadpool" }
"actix-connect" -> { "actix-service" "actix-codec" "actix-utils" "actix-rt" }
} }

View File

@ -2,31 +2,29 @@ digraph {
subgraph cluster_web { subgraph cluster_web {
label="actix/actix-web" label="actix/actix-web"
"awc" "awc"
"web" "actix-web"
"files" "actix-files"
"http" "actix-http"
"multipart" "actix-multipart"
"web-actors" "actix-web-actors"
"codegen" "actix-web-codegen"
"http-test" "actix-http-test"
} }
"web" -> { "codec" "service" "utils" "router" "rt" "server" "testing" "macros" "threadpool" "tls" "codegen" "http" "awc" } "actix-web" -> { "actix-codec" "actix-service" "actix-utils" "actix-router" "actix-rt" "actix-server" "macros" "threadpool" "actix-tls" "actix-web-codegen" "actix-http" "awc" }
"awc" -> { "codec" "service" "http" "rt" } "awc" -> { "actix-codec" "actix-service" "actix-http" "actix-rt" }
"web-actors" -> { "actix" "web" "http" "codec" } "actix-web-actors" -> { "actix" "actix-web" "actix-http" "actix-codec" }
"multipart" -> { "web" "service" "utils" } "actix-multipart" -> { "actix-web" "actix-service" "actix-utils" }
"http" -> { "service" "codec" "connect" "utils" "rt" "threadpool" } "actix-http" -> { "actix-service" "actix-codec" "actix-tls" "actix-utils" "actix-rt" "threadpool" }
"http" -> { "actix" "tls" }[color=blue] // optional "actix-http" -> { "actix" "actix-tls" }[color=blue] // optional
"files" -> { "web" } "actix-files" -> { "actix-web" }
"http-test" -> { "service" "codec" "connect" "utils" "rt" "server" "testing" "awc" } "actix-http-test" -> { "actix-service" "actix-codec" "actix-tls" "actix-utils" "actix-rt" "actix-server" "awc" }
// net // net
"utils" -> { "service" "rt" "codec" } "actix-utils" -> { "actix-service" "actix-rt" "actix-codec" }
"tracing" -> { "service" } "actix-tracing" -> { "actix-service" }
"tls" -> { "service" "codec" "utils" } "actix-tls" -> { "actix-service" "actix-codec" "actix-utils" }
"testing" -> { "rt" "macros" "server" "service" } "actix-server" -> { "actix-service" "actix-rt" "actix-codec" "actix-utils" }
"server" -> { "service" "rt" "codec" "utils" } "actix-rt" -> { "macros" "threadpool" }
"rt" -> { "macros" "threadpool" }
"connect" -> { "service" "codec" "utils" "rt" }
} }

View File

@ -201,14 +201,14 @@ macro_rules! factory_tuple ({ $(($n:tt, $T:ident)),+} => {
mod m { mod m {
use super::*; use super::*;
factory_tuple!((0, A)); factory_tuple!((0, A));
factory_tuple!((0, A), (1, B)); factory_tuple!((0, A), (1, B));
factory_tuple!((0, A), (1, B), (2, C)); factory_tuple!((0, A), (1, B), (2, C));
factory_tuple!((0, A), (1, B), (2, C), (3, D)); factory_tuple!((0, A), (1, B), (2, C), (3, D));
factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E)); factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E));
factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F)); factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F));
factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G)); factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G));
factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H)); factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H));
factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H), (8, I)); factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H), (8, I));
factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H), (8, I), (9, J)); factory_tuple!((0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H), (8, I), (9, J));
} }