Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change String to &str for all Rocket functions and some other fixes #3491

Merged
merged 3 commits into from
Apr 30, 2023
Merged

Change String to &str for all Rocket functions and some other fixes #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18abf22
Fix admin post endpoints
BlackDex Apr 30, 2023
951ba55
Prevent some `::_` logs from outputting
BlackDex Apr 30, 2023
f906f62
Change `String` to `&str` for all Rocket functions
BlackDex Apr 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 48 additions & 48 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ unstable = []

[target."cfg(not(windows))".dependencies]
# Logging
syslog = "6.0.1"
syslog = "6.1.0"

[dependencies]
# Logging
Expand All @@ -57,7 +57,7 @@ num-derive = "0.3.3"
# Web framework
rocket = { version = "0.5.0-rc.3", features = ["tls", "json"], default-features = false }
# rocket_ws = { version ="0.1.0-rc.3" }
rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = "a82508b403420bd941c32ddec3ee3e4875f2b8a5" }
rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = "9b0564ed27f90686b333337d9f6ed76484a84b27" }

# WebSockets libraries
tokio-tungstenite = "0.18.0"
Expand All @@ -68,7 +68,7 @@ dashmap = "5.4.0"

# Async futures
futures = "0.3.28"
tokio = { version = "1.27.0", features = ["rt-multi-thread", "fs", "io-util", "parking_lot", "time", "signal"] }
tokio = { version = "1.28.0", features = ["rt-multi-thread", "fs", "io-util", "parking_lot", "time", "signal"] }

# A generic serialization/deserialization framework
serde = { version = "1.0.160", features = ["derive"] }
Expand All @@ -87,7 +87,7 @@ rand = { version = "0.8.5", features = ["small_rng"] }
ring = "0.16.20"

# UUID generation
uuid = { version = "1.3.1", features = ["v4"] }
uuid = { version = "1.3.2", features = ["v4"] }

# Date and time libraries
chrono = { version = "0.4.24", features = ["clock", "serde"], default-features = false }
Expand Down Expand Up @@ -124,7 +124,7 @@ email_address = "0.2.4"
handlebars = { version = "4.3.6", features = ["dir_source"] }

# HTTP client (Used for favicons, version check, DUO and HIBP API)
reqwest = { version = "0.11.16", features = ["stream", "json", "gzip", "brotli", "socks", "cookies", "trust-dns"] }
reqwest = { version = "0.11.17", features = ["stream", "json", "gzip", "brotli", "socks", "cookies", "trust-dns"] }

# Favicon extraction libraries
html5gum = "0.5.2"
Expand All @@ -140,7 +140,7 @@ cookie = "0.16.2"
cookie_store = "0.19.0"

# Used by U2F, JWT and PostgreSQL
openssl = "0.10.51"
openssl = "0.10.52"

# CLI argument parsing
pico-args = "0.5.0"
Expand All @@ -154,7 +154,7 @@ semver = "1.0.17"

# Allow overriding the default memory allocator
# Mainly used for the musl builds, since the default musl malloc is very slow
mimalloc = { version = "0.1.36", features = ["secure"], default-features = false, optional = true }
mimalloc = { version = "0.1.37", features = ["secure"], default-features = false, optional = true }
which = "4.4.0"

# Argon2 library with support for the PHC format
Expand All @@ -164,8 +164,8 @@ argon2 = "0.5.0"
rpassword = "7.2.0"

[patch.crates-io]
rocket = { git = 'https://github.com/SergioBenitez/Rocket', rev = 'a82508b403420bd941c32ddec3ee3e4875f2b8a5' }
# rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = 'a82508b403420bd941c32ddec3ee3e4875f2b8a5' }
rocket = { git = 'https://github.com/SergioBenitez/Rocket', rev = '9b0564ed27f90686b333337d9f6ed76484a84b27' }
# rocket_ws = { git = 'https://github.com/SergioBenitez/Rocket', rev = '9b0564ed27f90686b333337d9f6ed76484a84b27' }

# Strip debuginfo from the release builds
# Also enable thin LTO for some optimizations
Expand Down
Loading