Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ single_match_else = "allow" # TODO: easy fix
struct_excessive_bools = "allow" # TODO: bogus lint?
trivially_copy_pass_by_ref = "allow"
uninlined_format_args = "allow" # TODO: easy fix
unnecessary_semicolon = "allow" # TODO: easy fix
unnecessary_trailing_comma = "allow"
unnested_or_patterns = "allow"
unused_async = "allow" # TODO: is it for API?
Expand Down
2 changes: 1 addition & 1 deletion src/client/dispatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ where
this.call_back.set(Some(call_back));
return Poll::Pending;
}
};
}
trace!("send_when canceled");
// Tell pipe_task to reset the h2 stream so that
// RST_STREAM is sent and flow-control capacity freed.
Expand Down
2 changes: 1 addition & 1 deletion src/proto/h1/conn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ where
return
}
Reading::Init => (),
};
}

match self.state.writing {
Writing::Body(..) => return,
Expand Down
4 changes: 2 additions & 2 deletions src/proto/h2/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ where
return Poll::Ready(());
}
Poll::Pending => (),
};
}
Poll::Pending
}
}
Expand Down Expand Up @@ -688,7 +688,7 @@ where
Poll::Ready(Err(crate::Error::new_h2(err)))
};
}
};
}

// If we were waiting on pending open
// continue where we left off.
Expand Down
4 changes: 2 additions & 2 deletions src/server/conn/http1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ where
// error letting them know about that.
pending.manual();
}
};
}
Poll::Ready(Ok(()))
}
Err(e) => Poll::Ready(Err(e)),
Expand Down Expand Up @@ -479,7 +479,7 @@ impl Builder {
.check(self.h1_header_read_timeout, "header_read_timeout")
{
conn.set_http1_header_read_timeout(dur);
};
}
if let Some(writev) = self.h1_writev {
if writev {
conn.set_write_strategy_queue();
Expand Down
Loading