Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 775ae5a0 authored by Vovo Yang's avatar Vovo Yang Committed by Gerrit Code Review
Browse files

Merge "Floss: Do not use tokio feature memchr" into main

parents 6507424a 426ad0be

system/gd/rust/linux/client/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ dbus_macros = { path = "../dbus_projection/dbus_macros" } 
futures = "0.3.13"

num-traits = "0.2"

shell-words = "1.1.0"

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'memchr', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }



clap = "2.33.3"

chrono = "0.4.24"

system/gd/rust/linux/service/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ lazy_static = "1.4" 
log = "0.4.14"

nix = "0.23"

num-traits = "0.2"

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'memchr', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }



[build-dependencies]

pkg-config = "0.3.19"

system/gd/rust/linux/stack/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ num-traits = "0.2" 
rand = { version = "0.8.3", features = ["small_rng"] }

serde_json = "1.0"

syslog = "6"

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'memchr', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }



[lib]

path = "src/lib.rs"

system/gd/rust/shim/Cargo.toml

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ protoc-rust = "2.0" 
quote = "1.0.8"

thiserror = "1.0"

syn = { version = "2.0.1", features = ['default', 'full'] }

tokio = { version = "1.0", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'memchr', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }

tokio-stream = "0.1"

walkdir = "2.2"



[lib]

system/gd/rust/topshim/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ log = "0.4" 
num-derive = "0.3"

num-traits = "0.2"

proc-macro2 = "1.0"

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'memchr', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }

tokio-stream = "0.1"

bitflags ="1.2"