Skip to content

Commit fc1a10f

Browse files
Fix typo in extract::ws (#1664)
Co-authored-by: David Pedersen <[email protected]>
1 parent f8ba531 commit fc1a10f

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

axum/CHANGELOG.md

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

1010
- **changed:** Update to tower-http 0.4. axum is still compatible with tower-http 0.3
1111
- **breaking:** Change `sse::Event::json_data` to use `axum_core::Error` as its error type ([#1762])
12+
- **breaking:** Rename `DefaultOnFailedUpdgrade` to `DefaultOnFailedUpgrade` ([#1664])
13+
- **breaking:** Rename `OnFailedUpdgrade` to `OnFailedUpgrade` ([#1664])
1214

1315
[#1762]: https://github.com/tokio-rs/axum/pull/1762
16+
[#1664]: https://github.com/tokio-rs/axum/pull/1664
1417

1518
# 0.6.8 (24. February, 2023)
1619

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,
@@ -290,7 +290,7 @@ impl<F> WebSocketUpgrade<F> {
290290
where
291291
C: FnOnce(WebSocket) -> Fut + Send + 'static,
292292
Fut: Future<Output = ()> + Send + 'static,
293-
F: OnFailedUpdgrade,
293+
F: OnFailedUpgrade,
294294
{
295295
let on_upgrade = self.on_upgrade;
296296
let config = self.config;
@@ -342,12 +342,12 @@ impl<F> WebSocketUpgrade<F> {
342342
/// What to do when a connection upgrade fails.
343343
///
344344
/// See [`WebSocketUpgrade::on_failed_upgrade`] for more details.
345-
pub trait OnFailedUpdgrade: Send + 'static {
345+
pub trait OnFailedUpgrade: Send + 'static {
346346
/// Call the callback.
347347
fn call(self, error: Error);
348348
}
349349

350-
impl<F> OnFailedUpdgrade for F
350+
impl<F> OnFailedUpgrade for F
351351
where
352352
F: FnOnce(Error) + Send + 'static,
353353
{
@@ -356,20 +356,20 @@ where
356356
}
357357
}
358358

359-
/// The default `OnFailedUpdgrade` used by `WebSocketUpgrade`.
359+
/// The default `OnFailedUpgrade` used by `WebSocketUpgrade`.
360360
///
361361
/// It simply ignores the error.
362362
#[non_exhaustive]
363363
#[derive(Debug)]
364-
pub struct DefaultOnFailedUpdgrade;
364+
pub struct DefaultOnFailedUpgrade;
365365

366-
impl OnFailedUpdgrade for DefaultOnFailedUpdgrade {
366+
impl OnFailedUpgrade for DefaultOnFailedUpgrade {
367367
#[inline]
368368
fn call(self, _error: Error) {}
369369
}
370370

371371
#[async_trait]
372-
impl<S> FromRequestParts<S> for WebSocketUpgrade<DefaultOnFailedUpdgrade>
372+
impl<S> FromRequestParts<S> for WebSocketUpgrade<DefaultOnFailedUpgrade>
373373
where
374374
S: Send + Sync,
375375
{
@@ -410,7 +410,7 @@ where
410410
sec_websocket_key,
411411
on_upgrade,
412412
sec_websocket_protocol,
413-
on_failed_upgrade: DefaultOnFailedUpdgrade,
413+
on_failed_upgrade: DefaultOnFailedUpgrade,
414414
})
415415
}
416416
}

0 commit comments

Comments
 (0)