Skip to content

Commit 6e0a29f

Browse files
Fix typo in extract::ws (#1664)
Co-authored-by: David Pedersen <david.pdrsn@gmail.com>
1 parent 57fe860 commit 6e0a29f

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

axum/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
# Unreleased
99

1010
- **breaking:** Change `sse::Event::json_data` to use `axum_core::Error` as its error type ([#1762])
11+
- **breaking:** Rename `DefaultOnFailedUpdgrade` to `DefaultOnFailedUpgrade` ([#1664])
12+
- **breaking:** Rename `OnFailedUpdgrade` to `OnFailedUpgrade` ([#1664])
1113

1214
[#1762]: https://github.com/tokio-rs/axum/pull/1762
15+
[#1664]: https://github.com/tokio-rs/axum/pull/1664
1316

1417
# 0.6.16 (18. April, 2023)
1518

axum/src/extract/ws.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ use tokio_tungstenite::{
135135
///
136136
/// See the [module docs](self) for an example.
137137
#[cfg_attr(docsrs, doc(cfg(feature = "ws")))]
138-
pub struct WebSocketUpgrade<F = DefaultOnFailedUpdgrade> {
138+
pub struct WebSocketUpgrade<F = DefaultOnFailedUpgrade> {
139139
config: WebSocketConfig,
140140
/// The chosen protocol sent in the `Sec-WebSocket-Protocol` header of the response.
141141
protocol: Option<HeaderValue>,
@@ -268,7 +268,7 @@ impl<F> WebSocketUpgrade<F> {
268268
/// ```
269269
pub fn on_failed_upgrade<C>(self, callback: C) -> WebSocketUpgrade<C>
270270
where
271-
C: OnFailedUpdgrade,
271+
C: OnFailedUpgrade,
272272
{
273273
WebSocketUpgrade {
274274
config: self.config,
@@ -287,7 +287,7 @@ impl<F> WebSocketUpgrade<F> {
287287
where
288288
C: FnOnce(WebSocket) -> Fut + Send + 'static,
289289
Fut: Future<Output = ()> + Send + 'static,
290-
F: OnFailedUpdgrade,
290+
F: OnFailedUpgrade,
291291
{
292292
let on_upgrade = self.on_upgrade;
293293
let config = self.config;
@@ -339,12 +339,12 @@ impl<F> WebSocketUpgrade<F> {
339339
/// What to do when a connection upgrade fails.
340340
///
341341
/// See [`WebSocketUpgrade::on_failed_upgrade`] for more details.
342-
pub trait OnFailedUpdgrade: Send + 'static {
342+
pub trait OnFailedUpgrade: Send + 'static {
343343
/// Call the callback.
344344
fn call(self, error: Error);
345345
}
346346

347-
impl<F> OnFailedUpdgrade for F
347+
impl<F> OnFailedUpgrade for F
348348
where
349349
F: FnOnce(Error) + Send + 'static,
350350
{
@@ -353,20 +353,20 @@ where
353353
}
354354
}
355355

356-
/// The default `OnFailedUpdgrade` used by `WebSocketUpgrade`.
356+
/// The default `OnFailedUpgrade` used by `WebSocketUpgrade`.
357357
///
358358
/// It simply ignores the error.
359359
#[non_exhaustive]
360360
#[derive(Debug)]
361-
pub struct DefaultOnFailedUpdgrade;
361+
pub struct DefaultOnFailedUpgrade;
362362

363-
impl OnFailedUpdgrade for DefaultOnFailedUpdgrade {
363+
impl OnFailedUpgrade for DefaultOnFailedUpgrade {
364364
#[inline]
365365
fn call(self, _error: Error) {}
366366
}
367367

368368
#[async_trait]
369-
impl<S> FromRequestParts<S> for WebSocketUpgrade<DefaultOnFailedUpdgrade>
369+
impl<S> FromRequestParts<S> for WebSocketUpgrade<DefaultOnFailedUpgrade>
370370
where
371371
S: Send + Sync,
372372
{
@@ -407,7 +407,7 @@ where
407407
sec_websocket_key,
408408
on_upgrade,
409409
sec_websocket_protocol,
410-
on_failed_upgrade: DefaultOnFailedUpdgrade,
410+
on_failed_upgrade: DefaultOnFailedUpgrade,
411411
})
412412
}
413413
}

0 commit comments

Comments
 (0)