Skip to content

refactor(axum): Refactor json module #3332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 29, 2025
Merged

refactor(axum): Refactor json module #3332

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cc4c45
refactor(axum/json): Simplify internal function
daalfox Apr 29, 2025
09f6976
Refactor `FromRequest` implementation
daalfox Apr 29, 2025
44c7c39
Remove unnecessary trailing semicolon
daalfox Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions axum/src/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ where
type Rejection = JsonRejection;

async fn from_request(req: Request, state: &S) -> Result<Self, Self::Rejection> {
if json_content_type(req.headers()) {
let bytes = Bytes::from_request(req, state).await?;
Self::from_bytes(&bytes)
} else {
Err(MissingJsonContentType.into())
if !json_content_type(req.headers()) {
return Err(MissingJsonContentType.into());
}

let bytes = Bytes::from_request(req, state).await?;
Self::from_bytes(&bytes)
}
}

Expand All @@ -136,21 +136,15 @@ where
}

fn json_content_type(headers: &HeaderMap) -> bool {
let content_type = if let Some(content_type) = headers.get(header::CONTENT_TYPE) {
content_type
} else {
let Some(content_type) = headers.get(header::CONTENT_TYPE) else {
return false;
};

let content_type = if let Ok(content_type) = content_type.to_str() {
content_type
} else {
let Ok(content_type) = content_type.to_str() else {
return false;
};

let mime = if let Ok(mime) = content_type.parse::<mime::Mime>() {
mime
} else {
let Ok(mime) = content_type.parse::<mime::Mime>() else {
return false;
};

Expand Down
Loading