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

Merge branch 'master' into master

This commit is contained in:
Rob Ede 2024-06-07 14:38:35 +01:00 committed by GitHub
parent d996658ac4 ebd8bb266d
commit f0b05fa1fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0 uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
with: with:
toolchain: nightly-2024-04-26 toolchain: nightly-2024-06-07
- name: Install cargo-public-api - name: Install cargo-public-api
uses: taiki-e/install-action@v2.34.0 uses: taiki-e/install-action@v2.34.0

4
actix-web/src/app.rs
View File

@ -112,8 +112,8 @@ where
/// }) /// })
/// ``` /// ```
#[doc(alias = "manage")] #[doc(alias = "manage")]
pub fn app_data<U: 'static>(mut self, ext: U) -> Self { pub fn app_data<U: 'static>(mut self, data: U) -> Self {
self.extensions.insert(ext); self.extensions.insert(data);
self self
} }