Skip to content
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.

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

Pass argument by reference to CacheKey constructor #24374

Merged
merged 1 commit into from Oct 5, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Pass argument by reference to CacheKey constructor

Argument now passed by reference, and clone() removed when calling
constructor.
  • Loading branch information
Tugdual committed Oct 5, 2019
commit 85e641827190b02d612c4f6f09f74245bdbc65da
@@ -38,7 +38,7 @@ pub struct CacheKey {
}

impl CacheKey {
fn new(request: Request) -> CacheKey {
fn new(request: &Request) -> CacheKey {
CacheKey {
url: request.current_url(),
}
@@ -575,7 +575,7 @@ impl HttpCache {
// Only Get requests are cached, avoid a url based match for others.
return None;
}
let entry_key = CacheKey::new(request.clone());
let entry_key = CacheKey::new(&request);
let resources = self
.entries
.get(&entry_key)?
@@ -672,7 +672,7 @@ impl HttpCache {
if let ResponseBody::Done(ref completed_body) =
*response.actual_response().body.lock().unwrap()
{
let entry_key = CacheKey::new(request.clone());
let entry_key = CacheKey::new(&request);
if let Some(cached_resources) = self.entries.get(&entry_key) {
// Ensure we only wake-up consumers of relevant resources,
// ie we don't want to wake-up 200 awaiting consumers with a 206.
@@ -709,7 +709,7 @@ impl HttpCache {
done_chan: &mut DoneChannel,
) -> Option<Response> {
assert_eq!(response.status.map(|s| s.0), Some(StatusCode::NOT_MODIFIED));
let entry_key = CacheKey::new(request.clone());
let entry_key = CacheKey::new(&request);
if let Some(cached_resources) = self.entries.get_mut(&entry_key) {
for cached_resource in cached_resources.iter_mut() {
// done_chan will have been set to Some(..) by http_network_fetch.
@@ -809,7 +809,7 @@ impl HttpCache {
// responses to be stored is present in the response.
return;
};
let entry_key = CacheKey::new(request.clone());
let entry_key = CacheKey::new(&request);
let metadata = match response.metadata() {
Ok(FetchMetadata::Filtered {
filtered: _,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.