berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into dependabot/cargo/brotli-7

This commit is contained in:
Rob Ede 2024-10-07 21:26:05 +01:00 committed by GitHub
parent 42951915ac 049b49290d
commit e7e4a6465a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci-post-merge.yml vendored
View File

@ -44,12 +44,12 @@ jobs:
echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
- name: Install Rust (${{ matrix.version.name }}) - name: Install Rust (${{ matrix.version.name }})
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: ${{ matrix.version.version }} toolchain: ${{ matrix.version.version }}
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
uses: taiki-e/install-action@v2.44.15 uses: taiki-e/install-action@v2.44.24
with: with:
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
@ -80,10 +80,10 @@ jobs:
uses: rui314/setup-mold@v1 uses: rui314/setup-mold@v1
- name: Install Rust - name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
- name: Install just, cargo-hack - name: Install just, cargo-hack
uses: taiki-e/install-action@v2.44.15 uses: taiki-e/install-action@v2.44.24
with: with:
tool: just,cargo-hack tool: just,cargo-hack

10
.github/workflows/ci.yml vendored
View File

@ -59,12 +59,12 @@ jobs:
uses: rui314/setup-mold@v1 uses: rui314/setup-mold@v1
- name: Install Rust (${{ matrix.version.name }}) - name: Install Rust (${{ matrix.version.name }})
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: ${{ matrix.version.version }} toolchain: ${{ matrix.version.version }}
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
uses: taiki-e/install-action@v2.44.15 uses: taiki-e/install-action@v2.44.24
with: with:
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
@ -92,7 +92,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install Rust - name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: nightly toolchain: nightly
@ -108,12 +108,12 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install Rust (nightly) - name: Install Rust (nightly)
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: nightly toolchain: nightly
- name: Install just - name: Install just
uses: taiki-e/install-action@v2.44.15 uses: taiki-e/install-action@v2.44.24
with: with:
tool: just tool: just

6
.github/workflows/coverage.yml vendored
View File

@ -18,13 +18,13 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install Rust (nightly) - name: Install Rust (nightly)
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: nightly toolchain: nightly
components: llvm-tools components: llvm-tools
- name: Install just, cargo-llvm-cov, cargo-nextest - name: Install just, cargo-llvm-cov, cargo-nextest
uses: taiki-e/install-action@v2.44.15 uses: taiki-e/install-action@v2.44.24
with: with:
tool: just,cargo-llvm-cov,cargo-nextest tool: just,cargo-llvm-cov,cargo-nextest
@ -32,7 +32,7 @@ jobs:
run: just test-coverage-codecov run: just test-coverage-codecov
- name: Upload coverage to Codecov - name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.5.0 uses: codecov/codecov-action@v4.6.0
with: with:
files: codecov.json files: codecov.json
fail_ci_if_error: true fail_ci_if_error: true

14
.github/workflows/lint.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install Rust (nightly) - name: Install Rust (nightly)
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: nightly toolchain: nightly
components: rustfmt components: rustfmt
@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install Rust - name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
components: clippy components: clippy
@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install Rust (nightly) - name: Install Rust (nightly)
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: nightly toolchain: nightly
components: rust-docs components: rust-docs
@ -72,12 +72,12 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install Rust (nightly-2024-05-01) - name: Install Rust (nightly-2024-05-01)
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: nightly-2024-05-01 toolchain: nightly-2024-05-01
- name: Install just - name: Install just
uses: taiki-e/install-action@v2.44.15 uses: taiki-e/install-action@v2.44.24
with: with:
tool: just tool: just
@ -101,12 +101,12 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Rust (nightly-2024-09-30) - name: Install Rust (nightly-2024-09-30)
uses: actions-rust-lang/setup-rust-toolchain@v1.10.0 uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with: with:
toolchain: nightly-2024-09-30 toolchain: nightly-2024-09-30
- name: Install cargo-public-api - name: Install cargo-public-api
uses: taiki-e/install-action@v2.44.15 uses: taiki-e/install-action@v2.44.24
with: with:
tool: cargo-public-api tool: cargo-public-api

15
actix-web/src/http/header/content_disposition.rs
View File

@ -206,11 +206,11 @@ impl DispositionParam {
} }
} }
/// A *Content-Disposition* header. It is compatible to be used either as /// `Content-Disposition` header.
/// [a response header for the main body](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition#as_a_response_header_for_the_main_body) ///
/// as (re)defined in [RFC 6266](https://datatracker.ietf.org/doc/html/rfc6266), or as /// It is compatible to be used either as [a response header for the main body][use_main_body]
/// [a header for a multipart body](https://mdn.io/Content-Disposition#As_a_header_for_a_multipart_body) /// as (re)defined in [RFC 6266], or as [a header for a multipart body][use_multipart] as
/// as (re)defined in [RFC 7587](https://datatracker.ietf.org/doc/html/rfc7578). /// (re)defined in [RFC 7587].
/// ///
/// In a regular HTTP response, the *Content-Disposition* response header is a header indicating if /// In a regular HTTP response, the *Content-Disposition* response header is a header indicating if
/// the content is expected to be displayed *inline* in the browser, that is, as a Web page or as /// the content is expected to be displayed *inline* in the browser, that is, as a Web page or as
@ -305,6 +305,11 @@ impl DispositionParam {
/// change to match local file system conventions if applicable, and do not use directory path /// change to match local file system conventions if applicable, and do not use directory path
/// information that may be present. /// information that may be present.
/// See [RFC 2183 §2.3](https://datatracker.ietf.org/doc/html/rfc2183#section-2.3). /// See [RFC 2183 §2.3](https://datatracker.ietf.org/doc/html/rfc2183#section-2.3).
///
/// [use_main_body]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition#as_a_response_header_for_the_main_body
/// [RFC 6266]: https://datatracker.ietf.org/doc/html/rfc6266
/// [use_multipart]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition#as_a_header_for_a_multipart_body
/// [RFC 7587]: https://datatracker.ietf.org/doc/html/rfc7578
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct ContentDisposition { pub struct ContentDisposition {
/// The disposition type /// The disposition type

1
justfile
View File

@ -73,6 +73,7 @@ test-coverage-lcov toolchain="": (test-coverage toolchain)
# Document crates in workspace. # Document crates in workspace.
doc *args: && doc-set-workspace-crates doc *args: && doc-set-workspace-crates
rm -f "$(cargo metadata --format-version=1 | jq -r '.target_directory')/doc/crates.js"
RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --workspace {{ all_crate_features }} {{ args }} RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --workspace {{ all_crate_features }} {{ args }}
[private] [private]