Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: add profiling feature
nathan47ccfbf4edb7
diff --git a/frontend/rust-lib/.cargo/config.toml b/frontend/rust-lib/.cargo/config.tomldeleted file mode 100644index f6792d6cbd..0000000000--- a/frontend/rust-lib/.cargo/config.toml+++ /dev/null@@ -1,24 +0,0 @@-[build]-rustflags = ["--cfg", "tokio_unstable"]--[target.x86_64-apple-darwin]-rustflags=["-C", "link-arg=-mmacosx-version-min=10.11"]--[target.aarch64-apple-darwin]-rustflags=["-C", "link-arg=-mmacosx-version-min=10.11"]--[target.aarch64-linux-android]-ar = "path-to-ndk/llvm-ar"-linker = "path-to-ndk/aarch64-linux-android29-clang"--[target.armv7-linux-androideabi]-ar = "path-to-ndk/llvm-ar"-linker = "path-to-ndk/armv7a-linux-androideabi29-clang"--[target.i686-linux-android]-ar = "path-to-ndk/llvm-ar"-linker = "path-to-ndk/i686-linux-android29-clang"--[target.x86_64-linux-android]-ar = "path-to-ndk/llvm-ar"-linker = "path-to-ndk/x86_64-linux-android29-clang"\ No newline at end of filediff --git a/frontend/rust-lib/dart-ffi/.cargo/config.toml b/frontend/rust-lib/dart-ffi/.cargo/config.tomlnew file mode 100644index 0000000000..bff29e6e17--- /dev/null+++ b/frontend/rust-lib/dart-ffi/.cargo/config.toml@@ -0,0 +1,2 @@+[build]+rustflags = ["--cfg", "tokio_unstable"]diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.tomlindex 7f7a2af45f..66a919987b 100644--- a/frontend/rust-lib/dart-ffi/Cargo.toml+++ b/frontend/rust-lib/dart-ffi/Cargo.toml@@ -15,7 +15,7 @@ crate-type = ["staticlib"]allo-isolate = { version = "^0.1", features = ["catch-unwind"] }byteorder = { version = "1.4.3" }protobuf = { version = "2.28.0" }-tokio = { version = "1.26", features = ["rt", "rt-multi-thread"] }+tokio = { version = "1.26", features = ["full", "rt-multi-thread", "tracing"] }log = "0.4.17"serde = { version = "1.0", features = ["derive"] }serde_json = { version = "1.0" }diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.tomlindex c36c635fe3..591f459963 100644--- a/frontend/rust-lib/flowy-core/Cargo.toml+++ b/frontend/rust-lib/flowy-core/Cargo.toml@@ -24,8 +24,8 @@ flowy-task = { path = "../flowy-task" }tracing = { version = "0.1", features = ["log"] }futures-core = { version = "0.3", default-features = false }bytes = "1.4"-tokio = { version = "1.26", features = ["full", "tracing"] }-console-subscriber = "0.1.8"+tokio = { version = "1.26", features = ["full"] }+console-subscriber = { version = "0.1.8", optional = true }parking_lot = "0.12.1"revision-model = { path = "../../../shared-lib/revision-model" }@@ -37,6 +37,7 @@ serde_json = "1.0"[features]default = ["rev-sqlite"]+profiling = ["console-subscriber", "tokio/tracing"]http_sync = ["flowy-folder/cloud_sync", "flowy-document/cloud_sync"]native_sync = ["flowy-folder/cloud_sync", "flowy-document/cloud_sync"]use_bunyan = ["lib-log/use_bunyan"]diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rsindex b6b0c4ad3a..d096c65e60 100644--- a/frontend/rust-lib/flowy-core/src/lib.rs+++ b/frontend/rust-lib/flowy-core/src/lib.rs@@ -102,6 +102,11 @@ fn create_log_filter(level: String, with_crates: Vec<String>) -> String {filters.push(format!("dart_ffi={}", "info"));filters.push(format!("flowy_sqlite={}", "info"));filters.push(format!("flowy_net={}", "info"));+ #[cfg(feature = "profiling")]+ filters.push(format!("tokio={}", level));++ #[cfg(feature = "profiling")]+ filters.push(format!("runtime={}", level));filters.push(format!("tokio=trace,runtime=trace"));filters.join(",")}@@ -122,6 +127,7 @@ pub struct AppFlowyCore {impl AppFlowyCore {pub fn new(config: AppFlowyCoreConfig) -> Self {+ #[cfg(feature = "profiling")]console_subscriber::init();init_log(&config);diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs b/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rsindex 70881b4593..3d68613a4e 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs@@ -352,17 +352,20 @@ fn listen_on_database_block_event() {tokio::spawn(async move {loop {- while let Ok(event) = block_event_rx.recv().await {- let read_guard = view_editors.read().await;- let view_editors = read_guard.values();- let event = if view_editors.len() == 1 {- Cow::Owned(event)- } else {- Cow::Borrowed(&event)- };- for view_editor in view_editors {- view_editor.handle_block_event(event.clone()).await;- }+ match block_event_rx.recv().await {+ Ok(event) => {+ let read_guard = view_editors.read().await;+ let view_editors = read_guard.values();+ let event = if view_editors.len() == 1 {+ Cow::Owned(event)+ } else {+ Cow::Borrowed(&event)+ };+ for view_editor in view_editors {+ view_editor.handle_block_event(event.clone()).await;+ }+ },+ Err(_) => break,}}});diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lockindex d9cfacea20..7437eb1e5f 100644--- a/shared-lib/Cargo.lock+++ b/shared-lib/Cargo.lock@@ -11,6 +11,15 @@ dependencies = ["memchr",]+[[package]]+name = "android_system_properties"+version = "0.1.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"+dependencies = [+ "libc",+]+[[package]]name = "arrayvec"version = "0.5.2"@@ -19,19 +28,20 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"[[package]]name = "async-stream"-version = "0.3.3"+version = "0.3.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"+checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e"dependencies = ["async-stream-impl","futures-core",+ "pin-project-lite",][[package]]name = "async-stream-impl"-version = "0.3.3"+version = "0.3.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"+checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"dependencies = ["proc-macro2","quote",@@ -40,9 +50,9 @@ dependencies = [[[package]]name = "async-trait"-version = "0.1.59"+version = "0.1.64"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"+checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"dependencies = ["proc-macro2","quote",@@ -62,9 +72,9 @@ dependencies = [[[package]]name = "autocfg"-version = "1.0.1"+version = "1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"[[package]]name = "base64"@@ -102,6 +112,12 @@ dependencies = ["generic-array",]+[[package]]+name = "bumpalo"+version = "3.12.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"+[[package]]name = "byteorder"version = "1.4.3"@@ -110,9 +126,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"[[package]]name = "bytes"-version = "1.1.0"+version = "1.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"++[[package]]+name = "cc"+version = "1.0.79"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"[[package]]name = "cfg-if"@@ -122,24 +144,27 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"[[package]]name = "chrono"-version = "0.4.19"+version = "0.4.23"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"dependencies = [- "libc",+ "iana-time-zone",+ "js-sys","num-integer","num-traits","time",+ "wasm-bindgen","winapi",][[package]]-name = "claim"-version = "0.4.0"+name = "codespan-reporting"+version = "0.11.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "68ad37958d55b29a7088909368968d2fe876a24c203f8441195130f3b15194b9"+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"dependencies = [- "autocfg",+ "termcolor",+ "unicode-width",][[package]]@@ -154,6 +179,12 @@ dependencies = ["yaml-rust",]+[[package]]+name = "core-foundation-sys"+version = "0.8.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"+[[package]]name = "cpufeatures"version = "0.2.1"@@ -163,6 +194,50 @@ dependencies = ["libc",]+[[package]]+name = "cxx"+version = "1.0.91"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"+dependencies = [+ "cc",+ "cxxbridge-flags",+ "cxxbridge-macro",+ "link-cplusplus",+]++[[package]]+name = "cxx-build"+version = "1.0.91"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"+dependencies = [+ "cc",+ "codespan-reporting",+ "once_cell",+ "proc-macro2",+ "quote",+ "scratch",+ "syn",+]++[[package]]+name = "cxxbridge-flags"+version = "1.0.91"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"++[[package]]+name = "cxxbridge-macro"+version = "1.0.91"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"+dependencies = [+ "proc-macro2",+ "quote",+ "syn",+]+[[package]]name = "dashmap"version = "5.2.0"@@ -318,19 +393,18 @@ dependencies = [[[package]]name = "form_urlencoded"-version = "1.0.1"+version = "1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"dependencies = [- "matches","percent-encoding",][[package]]name = "futures"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"+checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"dependencies = ["futures-channel","futures-core",@@ -343,9 +417,9 @@ dependencies = [[[package]]name = "futures-channel"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"+checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"dependencies = ["futures-core","futures-sink",@@ -353,15 +427,15 @@ dependencies = [[[package]]name = "futures-core"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"+checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"[[package]]name = "futures-executor"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"+checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"dependencies = ["futures-core","futures-task",@@ -370,18 +444,16 @@ dependencies = [[[package]]name = "futures-io"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"+checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"[[package]]name = "futures-macro"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"+checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"dependencies = [- "autocfg",- "proc-macro-hack","proc-macro2","quote","syn",@@ -389,23 +461,22 @@ dependencies = [[[package]]name = "futures-sink"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"+checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"[[package]]name = "futures-task"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"+checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"[[package]]name = "futures-util"-version = "0.3.17"+version = "0.3.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"+checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"dependencies = [- "autocfg","futures-channel","futures-core","futures-io",@@ -415,8 +486,6 @@ dependencies = ["memchr","pin-project-lite","pin-utils",- "proc-macro-hack",- "proc-macro-nested","slab",]@@ -438,7 +507,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"dependencies = ["cfg-if","libc",- "wasi",+ "wasi 0.10.0+wasi-snapshot-preview1",][[package]]@@ -488,6 +557,30 @@ version = "2.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"+[[package]]+name = "iana-time-zone"+version = "0.1.53"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"+dependencies = [+ "android_system_properties",+ "core-foundation-sys",+ "iana-time-zone-haiku",+ "js-sys",+ "wasm-bindgen",+ "winapi",+]++[[package]]+name = "iana-time-zone-haiku"+version = "0.1.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"+dependencies = [+ "cxx",+ "cxx-build",+]+[[package]]name = "idna"version = "0.2.3"@@ -499,11 +592,21 @@ dependencies = ["unicode-normalization",]+[[package]]+name = "idna"+version = "0.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"+dependencies = [+ "unicode-bidi",+ "unicode-normalization",+]+[[package]]name = "indexmap"-version = "1.9.1"+version = "1.9.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"dependencies = ["autocfg","hashbrown",@@ -512,9 +615,9 @@ dependencies = [[[package]]name = "indextree"-version = "4.4.0"+version = "4.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "42b4b46b3311ebd8e5cd44f6b03b36e0f48a70552cf6b036afcebc5626794066"+checksum = "497f036ac2fae75c34224648a77802e5dd4e9cfb56f4713ab6b12b7160a0523b"[[package]]name = "instant"@@ -531,6 +634,15 @@ version = "0.4.8"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"+[[package]]+name = "js-sys"+version = "0.3.61"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"+dependencies = [+ "wasm-bindgen",+]+[[package]]name = "lazy_static"version = "1.4.0"@@ -609,9 +721,18 @@ dependencies = [[[package]]name = "libc"-version = "0.2.107"+version = "0.2.139"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"++[[package]]+name = "link-cplusplus"+version = "1.0.8"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"+dependencies = [+ "cc",+][[package]]name = "linked-hash-map"@@ -630,9 +751,9 @@ dependencies = [[[package]]name = "log"-version = "0.4.14"+version = "0.4.17"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"dependencies = ["cfg-if",]@@ -657,24 +778,14 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"[[package]]name = "mio"-version = "0.7.14"+version = "0.8.6"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"dependencies = ["libc","log",- "miow",- "ntapi",- "winapi",-]--[[package]]-name = "miow"-version = "0.3.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"-dependencies = [- "winapi",+ "wasi 0.11.0+wasi-snapshot-preview1",+ "windows-sys 0.45.0",][[package]]@@ -697,15 +808,6 @@ dependencies = ["version_check",]-[[package]]-name = "ntapi"-version = "0.3.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"-dependencies = [- "winapi",-]-[[package]]name = "num-integer"version = "0.1.44"@@ -737,9 +839,9 @@ dependencies = [[[package]]name = "once_cell"-version = "1.8.0"+version = "1.17.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"[[package]]name = "opaque-debug"@@ -792,14 +894,14 @@ dependencies = ["libc","redox_syscall","smallvec",- "windows-sys",+ "windows-sys 0.36.1",][[package]]name = "percent-encoding"-version = "2.1.0"+version = "2.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"[[package]]name = "pin-project"@@ -839,18 +941,6 @@ version = "0.2.15"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"-[[package]]-name = "proc-macro-hack"-version = "0.5.19"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"--[[package]]-name = "proc-macro-nested"-version = "0.1.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"-[[package]]name = "proc-macro2"version = "1.0.47"@@ -862,9 +952,9 @@ dependencies = [[[package]]name = "protobuf"-version = "2.25.2"+version = "2.28.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754"+checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"[[package]]name = "quickcheck"@@ -920,9 +1010,9 @@ dependencies = [[[package]]name = "rand_core"-version = "0.6.3"+version = "0.6.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"dependencies = ["getrandom",]@@ -975,6 +1065,12 @@ version = "1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"+[[package]]+name = "scratch"+version = "1.0.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"+[[package]]name = "serde"version = "1.0.136"@@ -1084,6 +1180,16 @@ version = "1.7.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"+[[package]]+name = "socket2"+version = "0.4.7"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"+dependencies = [+ "libc",+ "winapi",+]+[[package]]name = "static_assertions"version = "1.1.0"@@ -1155,7 +1261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"dependencies = ["libc",- "wasi",+ "wasi 0.10.0+wasi-snapshot-preview1","winapi",]@@ -1176,9 +1282,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"[[package]]name = "tokio"-version = "1.14.0"+version = "1.26.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144"+checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"dependencies = ["autocfg","bytes",@@ -1186,19 +1292,19 @@ dependencies = ["memchr","mio","num_cpus",- "once_cell",- "parking_lot 0.11.2",+ "parking_lot 0.12.1","pin-project-lite","signal-hook-registry",+ "socket2","tokio-macros",- "winapi",+ "windows-sys 0.45.0",][[package]]name = "tokio-macros"-version = "1.6.0"+version = "1.8.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e"+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"dependencies = ["proc-macro2","quote",@@ -1299,19 +1405,24 @@ dependencies = [[[package]]name = "unicode-segmentation"-version = "1.8.0"+version = "1.10.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"++[[package]]+name = "unicode-width"+version = "0.1.10"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"[[package]]name = "url"-version = "2.2.2"+version = "2.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"dependencies = ["form_urlencoded",- "idna",- "matches",+ "idna 0.3.0","percent-encoding",]@@ -1319,7 +1430,6 @@ dependencies = [name = "user-model"version = "0.1.0"dependencies = [- "claim","fake","fancy-regex","futures",@@ -1350,7 +1460,7 @@ version = "0.16.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591"dependencies = [- "idna",+ "idna 0.2.3","lazy_static","regex","serde",@@ -1371,6 +1481,66 @@ version = "0.10.0+wasi-snapshot-preview1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"+[[package]]+name = "wasi"+version = "0.11.0+wasi-snapshot-preview1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"++[[package]]+name = "wasm-bindgen"+version = "0.2.84"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"+dependencies = [+ "cfg-if",+ "wasm-bindgen-macro",+]++[[package]]+name = "wasm-bindgen-backend"+version = "0.2.84"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"+dependencies = [+ "bumpalo",+ "log",+ "once_cell",+ "proc-macro2",+ "quote",+ "syn",+ "wasm-bindgen-shared",+]++[[package]]+name = "wasm-bindgen-macro"+version = "0.2.84"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"+dependencies = [+ "quote",+ "wasm-bindgen-macro-support",+]++[[package]]+name = "wasm-bindgen-macro-support"+version = "0.2.84"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"+dependencies = [+ "proc-macro2",+ "quote",+ "syn",+ "wasm-bindgen-backend",+ "wasm-bindgen-shared",+]++[[package]]+name = "wasm-bindgen-shared"+version = "0.2.84"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"+[[package]]name = "winapi"version = "0.3.9"@@ -1408,43 +1578,109 @@ version = "0.36.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"dependencies = [- "windows_aarch64_msvc",- "windows_i686_gnu",- "windows_i686_msvc",- "windows_x86_64_gnu",- "windows_x86_64_msvc",+ "windows_aarch64_msvc 0.36.1",+ "windows_i686_gnu 0.36.1",+ "windows_i686_msvc 0.36.1",+ "windows_x86_64_gnu 0.36.1",+ "windows_x86_64_msvc 0.36.1",]+[[package]]+name = "windows-sys"+version = "0.45.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"+dependencies = [+ "windows-targets",+]++[[package]]+name = "windows-targets"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"+dependencies = [+ "windows_aarch64_gnullvm",+ "windows_aarch64_msvc 0.42.1",+ "windows_i686_gnu 0.42.1",+ "windows_i686_msvc 0.42.1",+ "windows_x86_64_gnu 0.42.1",+ "windows_x86_64_gnullvm",+ "windows_x86_64_msvc 0.42.1",+]++[[package]]+name = "windows_aarch64_gnullvm"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"+[[package]]name = "windows_aarch64_msvc"version = "0.36.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"+[[package]]+name = "windows_aarch64_msvc"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"+[[package]]name = "windows_i686_gnu"version = "0.36.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"+[[package]]+name = "windows_i686_gnu"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"+[[package]]name = "windows_i686_msvc"version = "0.36.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"+[[package]]+name = "windows_i686_msvc"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"+[[package]]name = "windows_x86_64_gnu"version = "0.36.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"+[[package]]+name = "windows_x86_64_gnu"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"++[[package]]+name = "windows_x86_64_gnullvm"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"+[[package]]name = "windows_x86_64_msvc"version = "0.36.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"+[[package]]+name = "windows_x86_64_msvc"+version = "0.42.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"+[[package]]name = "ws-model"version = "0.1.0"diff --git a/shared-lib/user-model/src/parser/user_email.rs b/shared-lib/user-model/src/parser/user_email.rsindex d8b0ca942d..176fd0f34b 100644--- a/shared-lib/user-model/src/parser/user_email.rs+++ b/shared-lib/user-model/src/parser/user_email.rs@@ -27,7 +27,6 @@ impl AsRef<str> for UserEmail {#[cfg(test)]mod tests {use super::*;- use claim::assert_err;use fake::{faker::internet::en::SafeEmail, Fake};use rand::prelude::StdRng;use rand_core::SeedableRng;@@ -35,19 +34,19 @@ mod tests {#[test]fn empty_string_is_rejected() {let email = "".to_string();- assert_err!(UserEmail::parse(email));+ assert!(UserEmail::parse(email).is_err());}#[test]fn email_missing_at_symbol_is_rejected() {let email = "helloworld.com".to_string();- assert_err!(UserEmail::parse(email));+ assert!(UserEmail::parse(email).is_err());}#[test]fn email_missing_subject_is_rejected() {let email = "@domain.com".to_string();- assert_err!(UserEmail::parse(email));+ assert!(UserEmail::parse(email).is_err());}#[derive(Debug, Clone)]diff --git a/shared-lib/user-model/src/parser/user_name.rs b/shared-lib/user-model/src/parser/user_name.rsindex 0e04b54136..4a8d8b0856 100644--- a/shared-lib/user-model/src/parser/user_name.rs+++ b/shared-lib/user-model/src/parser/user_name.rs@@ -42,43 +42,42 @@ impl AsRef<str> for UserName {#[cfg(test)]mod tests {use super::UserName;- use claim::{assert_err, assert_ok};#[test]fn a_256_grapheme_long_name_is_valid() {let name = "a̐".repeat(256);- assert_ok!(UserName::parse(name));+ assert!(UserName::parse(name).is_ok());}#[test]fn a_name_longer_than_256_graphemes_is_rejected() {let name = "a".repeat(257);- assert_err!(UserName::parse(name));+ assert!(UserName::parse(name).is_err());}#[test]fn whitespace_only_names_are_rejected() {let name = " ".to_string();- assert_err!(UserName::parse(name));+ assert!(UserName::parse(name).is_err());}#[test]fn empty_string_is_rejected() {let name = "".to_string();- assert_err!(UserName::parse(name));+ assert!(UserName::parse(name).is_err());}#[test]fn names_containing_an_invalid_character_are_rejected() {for name in &['/', '(', ')', '"', '<', '>', '\\', '{', '}'] {let name = name.to_string();- assert_err!(UserName::parse(name));+ assert!(UserName::parse(name).is_err());}}#[test]fn a_valid_name_is_parsed_successfully() {let name = "nathan".to_string();- assert_ok!(UserName::parse(name));+ assert!(UserName::parse(name).is_ok());}}