mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing default features from git2 package (#2078)

Browse source 
* don't need ssh or https in git2 - saves 50.69s

* codespell
This commit is contained in:
James Hodgkinson 2023-09-06 08:25:29 +10:00 committed by GitHub
parent d1fe7b9127
commit 2f312e6b2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Cargo.lock generated
View file

@ -1722,8 +1722,6 @@ dependencies = [
"libc", "libc",
"libgit2-sys", "libgit2-sys",
"log", "log",
"openssl-probe",
"openssl-sys",
"url", "url",
] ]
@ -2739,9 +2737,7 @@ checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
"libssh2-sys",
"libz-sys", "libz-sys",
"openssl-sys",
"pkg-config", "pkg-config",
] ]
@ -2777,20 +2773,6 @@ dependencies = [
"vcpkg", "vcpkg",
] ]
[[package]]
name = "libssh2-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
dependencies = [
"cc",
"libc",
"libz-sys",
"openssl-sys",
"pkg-config",
"vcpkg",
]
[[package]] [[package]]
name = "libudev" name = "libudev"
version = "0.2.0" version = "0.2.0"

13
Cargo.toml
View file

@ -120,7 +120,7 @@ fs2 = "^0.4.3"
futures = "^0.3.28" futures = "^0.3.28"
futures-concurrency = "^3.1.0" futures-concurrency = "^3.1.0"
futures-util = { version = "^0.3.21", features = ["sink"] } futures-util = { version = "^0.3.21", features = ["sink"] }
git2 = "0.17.2" git2 = { version = "0.17.2", default-features = false }
gloo = "^0.8.1" gloo = "^0.8.1"
hashbrown = { version = "0.14.0", features = ["serde", "inline-more", "ahash"] } hashbrown = { version = "0.14.0", features = ["serde", "inline-more", "ahash"] }
hex = "^0.4.3" hex = "^0.4.3"
@ -185,7 +185,10 @@ tokio-util = "^0.7.8"
toml = "^0.5.11" toml = "^0.5.11"
touch = "^0.0.1" touch = "^0.0.1"
tracing = { version = "^0.1.37", features = ["max_level_trace", "release_max_level_debug"] } tracing = { version = "^0.1.37", features = [
"max_level_trace",
"release_max_level_debug",
] }
# tracing = { version = "^0.1.37" } # tracing = { version = "^0.1.37" }
tracing-subscriber = { version = "^0.3.17", features = ["env-filter"] } tracing-subscriber = { version = "^0.3.17", features = ["env-filter"] }
tracing-forest = "^0.1.6" tracing-forest = "^0.1.6"
@ -201,7 +204,11 @@ wasm-bindgen = "^0.2.86"
wasm-bindgen-futures = "^0.4.30" wasm-bindgen-futures = "^0.4.30"
wasm-bindgen-test = "0.3.35" wasm-bindgen-test = "0.3.35"
webauthn-authenticator-rs = { version = "0.5.0-dev", features = ["softpasskey", "softtoken", "mozilla"] } webauthn-authenticator-rs = { version = "0.5.0-dev", features = [
"softpasskey",
"softtoken",
"mozilla",
] }
webauthn-rs = { version = "0.5.0-dev", features = ["preview-features"] } webauthn-rs = { version = "0.5.0-dev", features = ["preview-features"] }
webauthn-rs-core = "0.5.0-dev" webauthn-rs-core = "0.5.0-dev"
webauthn-rs-proto = "0.5.0-dev" webauthn-rs-proto = "0.5.0-dev"

2
server/lib/src/plugins/refint.rs
View file

@ -248,7 +248,7 @@ impl Plugin for ReferentialIntegrity {
} }
} }
// We can now combine this with the confict uuids from the incoming set. // We can now combine this with the conflict uuids from the incoming set.
// In a conflict case, we need to also add these uuids to the delete logic // In a conflict case, we need to also add these uuids to the delete logic
// since on the originator node the original uuid will still persist // since on the originator node the original uuid will still persist

2
server/lib/src/repl/tests.rs
View file

@ -2491,7 +2491,7 @@ async fn test_repl_increment_refint_conflict(server_a: &QueryServer, server_b: &
// the true intent of the situation now. // the true intent of the situation now.
// //
// In this example, the users created on server A was intended to be a member of // In this example, the users created on server A was intended to be a member of
// the group, but the user on server B *was not* intended to be a member. Therfore // the group, but the user on server B *was not* intended to be a member. Therefore
// it's wrong that we retain the user from Server B *while* also the membership // it's wrong that we retain the user from Server B *while* also the membership
// that was intended for the user on A. // that was intended for the user on A.
let e = server_b_txn let e = server_b_txn