File tree Expand file tree Collapse file tree 2 files changed +10
-12
lines changed Expand file tree Collapse file tree 2 files changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -57,12 +57,11 @@ impl<State> Endpoint<State> for ServeDir {
57
57
Ok ( file) => file,
58
58
} ;
59
59
60
- let len = match file. metadata ( ) . await {
61
- Ok ( metadata) => metadata. len ( ) as usize ,
62
- Err ( _) => {
63
- log:: warn!( "Could not retrieve metadata" ) ;
64
- return Ok ( Response :: new ( StatusCode :: InternalServerError ) ) ;
65
- }
60
+ let len = if let Ok ( metadata) = file. metadata ( ) . await {
61
+ metadata. len ( ) as usize
62
+ } else {
63
+ log:: warn!( "Could not retrieve metadata" ) ;
64
+ return Ok ( Response :: new ( StatusCode :: InternalServerError ) ) ;
66
65
} ;
67
66
68
67
let body = Body :: from_reader ( BufReader :: new ( file) , Some ( len) ) ;
Original file line number Diff line number Diff line change @@ -153,12 +153,11 @@ impl<State: Send + Sync + 'static> Middleware<State> for CorsMiddleware {
153
153
let origins = req. header ( & headers:: ORIGIN ) . cloned ( ) . unwrap_or_default ( ) ;
154
154
155
155
// TODO: how should multiple origin values be handled?
156
- let origin = match origins. first ( ) {
157
- Some ( origin) => origin,
158
- None => {
159
- // This is not a CORS request if there is no Origin header
160
- return next. run ( req) . await ;
161
- }
156
+ let origin = if let Some ( origin) = origins. first ( ) {
157
+ origin
158
+ } else {
159
+ // This is not a CORS request if there is no Origin header
160
+ return next. run ( req) . await ;
162
161
} ;
163
162
164
163
if !self . is_valid_origin ( origin) {
You can’t perform that action at this time.
0 commit comments