From 4a562dfdc1c550ca1832ea56a6fd41de04b536c6 Mon Sep 17 00:00:00 2001
From: j03-dev <24nomeniavo@gmail.com>
Date: Thu, 2 Nov 2023 08:08:24 +0300
Subject: [PATCH 1/3] Update to latest master Rocket version (#89)
---
Cargo.toml | 2 +-
src/fairing.rs | 2 +-
src/headers.rs | 10 +++++-----
src/lib.rs | 20 ++++++++++----------
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 2d7ce3b..1f944f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ serialization = ["serde", "serde_derive", "unicase_serde"]
[dependencies]
regex = "1.7.2"
-rocket = { version = "0.5.0-rc.3", default-features = false }
+rocket = { version = "0.5.0-rc.4", default-features = false }
log = "0.4"
unicase = "2.6"
url = "2.3.1"
diff --git a/src/fairing.rs b/src/fairing.rs
index b2dfa32..75fae81 100644
--- a/src/fairing.rs
+++ b/src/fairing.rs
@@ -34,7 +34,7 @@ impl rocket::route::Handler for FairingErrorRoute {
500
});
let status = Status::from_code(status).unwrap_or(Status::InternalServerError);
- Outcome::Failure(status)
+ Outcome::Error(status)
}
}
diff --git a/src/headers.rs b/src/headers.rs
index bcbfdf6..426dbe6 100644
--- a/src/headers.rs
+++ b/src/headers.rs
@@ -101,9 +101,9 @@ impl Origin {
match request.headers().get_one("Origin") {
Some(origin) => match Self::from_str(origin) {
Ok(origin) => Outcome::Success(origin),
- Err(e) => Outcome::Failure((Status::BadRequest, e)),
+ Err(e) => Outcome::Error((Status::BadRequest, e)),
},
- None => Outcome::Forward(()),
+ None => Outcome::Forward(Status::default()),
}
}
}
@@ -164,9 +164,9 @@ impl AccessControlRequestMethod {
match request.headers().get_one("Access-Control-Request-Method") {
Some(request_method) => match Self::from_str(request_method) {
Ok(request_method) => Outcome::Success(request_method),
- Err(_) => Outcome::Failure((Status::BadRequest, crate::Error::BadRequestMethod)),
+ Err(_) => Outcome::Error((Status::BadRequest, crate::Error::BadRequestMethod)),
},
- None => Outcome::Forward(()),
+ None => Outcome::Forward(Status::default()),
}
}
}
@@ -214,7 +214,7 @@ impl AccessControlRequestHeaders {
unreachable!("`AccessControlRequestHeaders::from_str` should never fail")
}
},
- None => Outcome::Forward(()),
+ None => Outcome::Forward(Status::default()),
}
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 79df650..25a1d13 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1515,13 +1515,13 @@ impl<'r> FromRequest<'r> for Guard<'r> {
Outcome::Success(options) => options,
_ => {
let error = Error::MissingCorsInRocketState;
- return Outcome::Failure((error.status(), error));
+ return Outcome::Error((error.status(), error));
}
};
match Response::validate_and_build(options, request) {
Ok(response) => Outcome::Success(Self::new(response)),
- Err(error) => Outcome::Failure((error.status(), error)),
+ Err(error) => Outcome::Error((error.status(), error)),
}
}
}
@@ -1757,27 +1757,27 @@ fn validate_allowed_headers(
/// Gets the `Origin` request header from the request
fn origin(request: &Request<'_>) -> Result