Skip to content

refactor(http1): remove ref_option lint #4101

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
seanmonstar merged 1 commit into from
Jun 13, 2026
+14 −15
Merged

refactor(http1): remove ref_option lint #4101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ pattern_type_mismatch = "allow"
question_mark = "allow" # TODO: probably easy fix
redundant_closure_for_method_calls = "allow"
redundant_else = "allow"
ref_option = "allow"
ref_patterns = "allow" # TODO: perhaps deny?
semicolon_if_nothing_returned = "allow" # TODO: easy fix
single_char_lifetime_names = "allow"
Expand Down
28 changes: 14 additions & 14 deletions src/proto/h1/role.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,13 +500,13 @@ impl Http1Transaction for Server {

#[cfg(feature = "server")]
impl Server {
fn can_have_body(method: &Option<Method>, status: StatusCode) -> bool {
fn can_have_body(method: Option<&Method>, status: StatusCode) -> bool {
Server::can_chunked(method, status)
}

fn can_chunked(method: &Option<Method>, status: StatusCode) -> bool {
if method == &Some(Method::HEAD)
|| method == &Some(Method::CONNECT) && status.is_success()
fn can_chunked(method: Option<&Method>, status: StatusCode) -> bool {
if method == Some(&Method::HEAD)
|| method == Some(&Method::CONNECT) && status.is_success()
|| status.is_informational()
{
false
Expand All @@ -515,16 +515,16 @@ impl Server {
}
}

fn can_have_content_length(method: &Option<Method>, status: StatusCode) -> bool {
if status.is_informational() || method == &Some(Method::CONNECT) && status.is_success() {
fn can_have_content_length(method: Option<&Method>, status: StatusCode) -> bool {
if status.is_informational() || method == Some(&Method::CONNECT) && status.is_success() {
false
} else {
!matches!(status, StatusCode::NO_CONTENT | StatusCode::NOT_MODIFIED)
}
}

fn can_have_implicit_zero_content_length(method: &Option<Method>, status: StatusCode) -> bool {
Server::can_have_content_length(method, status) && method != &Some(Method::HEAD)
fn can_have_implicit_zero_content_length(method: Option<&Method>, status: StatusCode) -> bool {
Server::can_have_content_length(method, status) && method != Some(&Method::HEAD)
}

fn encode_headers_with_lower_case(
Expand Down Expand Up @@ -801,7 +801,7 @@ impl Server {
}
// check that we actually can send a chunked body...
if msg.head.version == Version::HTTP_10
|| !Server::can_chunked(msg.req_method, msg.head.subject)
|| !Server::can_chunked(msg.req_method.as_ref(), msg.head.subject)
{
continue;
}
Expand Down Expand Up @@ -849,7 +849,7 @@ impl Server {
header::TRAILER => {
// check that we actually can send a chunked body...
if msg.head.version == Version::HTTP_10
|| !Server::can_chunked(msg.req_method, msg.head.subject)
|| !Server::can_chunked(msg.req_method.as_ref(), msg.head.subject)
{
continue;
}
Expand Down Expand Up @@ -911,7 +911,7 @@ impl Server {
encoder = match msg.body {
Some(BodyLength::Unknown) => {
if msg.head.version == Version::HTTP_10
|| !Server::can_chunked(msg.req_method, msg.head.subject)
|| !Server::can_chunked(msg.req_method.as_ref(), msg.head.subject)
{
Encoder::close_delimited()
} else {
Expand All @@ -925,7 +925,7 @@ impl Server {
}
None | Some(BodyLength::Known(0)) => {
if Server::can_have_implicit_zero_content_length(
msg.req_method,
msg.req_method.as_ref(),
msg.head.subject,
) {
header_name_writer.write_full_header_line(
Expand All @@ -937,7 +937,7 @@ impl Server {
Encoder::length(0)
}
Some(BodyLength::Known(len)) => {
if !Server::can_have_content_length(msg.req_method, msg.head.subject) {
if !Server::can_have_content_length(msg.req_method.as_ref(), msg.head.subject) {
Encoder::length(0)
} else {
header_name_writer.write_header_name_with_colon(
Expand All @@ -953,7 +953,7 @@ impl Server {
};
}

if !Server::can_have_body(msg.req_method, msg.head.subject) {
if !Server::can_have_body(msg.req_method.as_ref(), msg.head.subject) {
trace!(
"server body forced to 0; method={:?}, status={:?}",
msg.req_method,
Expand Down
Loading