mirrors/ntex-extras
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex-extras.git synced 2025-04-03 21:07:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor: ntex version and some clippy warning (#7)

Browse source 
* refactor: ntex version and some clippy warning

* refactor(workflow): linux default MSRV version to 1.65

* bugfix(workflow): windows openssl install
This commit is contained in:
leone 2023-04-04 00:08:44 +02:00 • committed by GitHub
parent 39f93ab05e
commit 7f7a9faaab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 132 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-cors/Cargo.toml
View file

@ -16,9 +16,9 @@ name = "ntex_cors"
path = "src/lib.rs"
[dependencies]
ntex = "0.6.0-beta.0"
ntex = "0.6.5"
derive_more = "0.99"
futures = "0.3"
[dev-dependencies]
ntex = { version = "0.6.0-beta.0", features=["tokio"] }
ntex = { version = "0.6.5", features=["tokio"] }

12
ntex-cors/src/lib.rs
View file

@ -536,7 +536,7 @@ impl Inner {
AllOrSome::Some(ref allowed_origins) => allowed_origins
.get(origin)
.map(|_| ())
.ok_or_else(|| CorsError::OriginNotAllowed),
.ok_or(CorsError::OriginNotAllowed),
};
}
Err(CorsError::BadOrigin)
@ -553,10 +553,8 @@ impl Inner {
AllOrSome::All => {
if self.send_wildcard {
Some(HeaderValue::from_static("*"))
} else if let Some(origin) = headers.get(&header::ORIGIN) {
Some(origin.clone())
} else {
None
headers.get(&header::ORIGIN).cloned()
}
}
AllOrSome::Some(ref origins) => {
@ -582,7 +580,7 @@ impl Inner {
.methods
.get(&method)
.map(|_| ())
.ok_or_else(|| CorsError::MethodNotAllowed);
.ok_or(CorsError::MethodNotAllowed);
}
}
Err(CorsError::BadRequestMethod)
@ -641,10 +639,8 @@ impl Inner {
)
.unwrap(),
)
} else if let Some(hdr) = req.headers.get(&header::ACCESS_CONTROL_REQUEST_HEADERS) {
Some(hdr.clone())
} else {
None
req.headers.get(&header::ACCESS_CONTROL_REQUEST_HEADERS).cloned()
};
let res = HttpResponse::Ok()