1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2025-04-14 22:04:06 +00:00

Merge branch 'master' into introspection

This commit is contained in:
Guillermo Céspedes Tabárez 2025-04-01 22:39:21 -03:00 committed by GitHub
commit 585552f70f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 24 additions and 24 deletions

View file

@ -49,7 +49,7 @@ jobs:
toolchain: ${{ matrix.version.version }}
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
uses: taiki-e/install-action@v2.49.32
uses: taiki-e/install-action@v2.49.39
with:
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
@ -83,7 +83,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
- name: Install just, cargo-hack
uses: taiki-e/install-action@v2.49.32
uses: taiki-e/install-action@v2.49.39
with:
tool: just,cargo-hack

View file

@ -64,7 +64,7 @@ jobs:
toolchain: ${{ matrix.version.version }}
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
uses: taiki-e/install-action@v2.49.32
uses: taiki-e/install-action@v2.49.39
with:
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
@ -113,7 +113,7 @@ jobs:
toolchain: nightly
- name: Install just
uses: taiki-e/install-action@v2.49.32
uses: taiki-e/install-action@v2.49.39
with:
tool: just

View file

@ -24,7 +24,7 @@ jobs:
components: llvm-tools
- name: Install just, cargo-llvm-cov, cargo-nextest
uses: taiki-e/install-action@v2.49.32
uses: taiki-e/install-action@v2.49.39
with:
tool: just,cargo-llvm-cov,cargo-nextest

View file

@ -77,7 +77,7 @@ jobs:
toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
- name: Install just
uses: taiki-e/install-action@v2.49.32
uses: taiki-e/install-action@v2.49.39
with:
tool: just

30
Cargo.lock generated
View file

@ -147,7 +147,7 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"slab",
"socket2 0.5.8",
"socket2 0.5.9",
"tokio",
]
@ -261,7 +261,7 @@ dependencies = [
"futures-core",
"futures-util",
"mio",
"socket2 0.5.8",
"socket2 0.5.9",
"tokio",
"tokio-uring",
"tracing",
@ -393,7 +393,7 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"smallvec",
"socket2 0.5.8",
"socket2 0.5.9",
"static_assertions",
"time",
"tokio",
@ -1833,7 +1833,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
dependencies = [
"socket2 0.5.8",
"socket2 0.5.9",
"widestring",
"windows-sys 0.48.0",
"winreg",
@ -2016,9 +2016,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.26"
version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
[[package]]
name = "lru-cache"
@ -2141,9 +2141,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.21.1"
version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "oorandom"
@ -2910,9 +2910,9 @@ dependencies = [
[[package]]
name = "socket2"
version = "0.5.8"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
dependencies = [
"libc",
"windows-sys 0.52.0",
@ -3036,9 +3036,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.40"
version = "0.3.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
dependencies = [
"deranged",
"itoa",
@ -3057,9 +3057,9 @@ checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
[[package]]
name = "time-macros"
version = "0.2.21"
version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
dependencies = [
"num-conv",
"time-core",
@ -3113,7 +3113,7 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.5.8",
"socket2 0.5.9",
"tokio-macros",
"windows-sys 0.52.0",
]

View file

@ -155,7 +155,7 @@ divan = "0.1.8"
env_logger = "0.11"
futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
memchr = "2.4"
once_cell = "1.9"
once_cell = "1.21"
rcgen = "0.13"
regex = "1.3"
rustversion = "1"

View file

@ -158,7 +158,7 @@ impl-more = "0.1.4"
language-tags = "0.3"
log = "0.4"
mime = "0.3"
once_cell = "1.5"
once_cell = "1.21"
pin-project-lite = "0.2.7"
regex = { version = "1.5.5", optional = true }
regex-lite = "0.1"

View file

@ -112,7 +112,7 @@ futures-util = { version = "0.3.17", default-features = false, features = ["allo
h2 = "0.3.26"
http = "0.2.7"
itoa = "1"
log =" 0.4"
log ="0.4"
mime = "0.3"
percent-encoding = "2.1"
pin-project-lite = "0.2"