Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

clippy: fix some leftover warnings in components/net (#32476)

Browse source
This commit is contained in:
Peter Mikola 2024-06-11 19:50:21 +02:00 • committed by GitHub
parent 55d067091c
commit 3c06536cb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/net/fetch/methods.rs
View file

@ -413,7 +413,7 @@ pub async fn main_fetch(
// Step 16. // Step 16.
if internal_response.url_list.is_empty() { if internal_response.url_list.is_empty() {
internal_response.url_list = request.url_list.clone(); internal_response.url_list.clone_from(&request.url_list)
} }
// Step 17. // Step 17.

25
components/net/http_cache.rs
View file

@ -328,14 +328,19 @@ fn create_cached_response(
.unwrap() .unwrap()
.push(done_sender); .push(done_sender);
} }
response.location_url = cached_resource.data.location_url.clone(); response
response.status = cached_resource.data.status.clone(); .location_url
response.raw_status = cached_resource.data.raw_status.clone(); .clone_from(&cached_resource.data.location_url);
response.url_list = cached_resource.data.url_list.clone(); response.status.clone_from(&cached_resource.data.status);
response
.raw_status
.clone_from(&cached_resource.data.raw_status);
response.url_list.clone_from(&cached_resource.data.url_list);
response.https_state = cached_resource.data.https_state; response.https_state = cached_resource.data.https_state;
response.referrer = request.referrer.to_url().cloned(); response.referrer = request.referrer.to_url().cloned();
response.referrer_policy = request.referrer_policy; response.referrer_policy = request.referrer_policy;
response.aborted = cached_resource.aborted.clone(); response.aborted = cached_resource.aborted.clone();
let expires = cached_resource.data.expires; let expires = cached_resource.data.expires;
let adjusted_expires = get_expiry_adjustment_from_request_headers(request, expires); let adjusted_expires = get_expiry_adjustment_from_request_headers(request, expires);
let now = Duration::seconds(time::now().to_timespec().sec); let now = Duration::seconds(time::now().to_timespec().sec);
@ -781,12 +786,18 @@ impl HttpCache {
resource_timing, resource_timing,
); );
constructed_response.body = cached_resource.body.clone(); constructed_response.body = cached_resource.body.clone();
constructed_response.status = cached_resource.data.status.clone(); constructed_response
.status
.clone_from(&cached_resource.data.status);
constructed_response.https_state = cached_resource.data.https_state; constructed_response.https_state = cached_resource.data.https_state;
constructed_response.referrer = request.referrer.to_url().cloned(); constructed_response.referrer = request.referrer.to_url().cloned();
constructed_response.referrer_policy = request.referrer_policy; constructed_response.referrer_policy = request.referrer_policy;
constructed_response.raw_status = cached_resource.data.raw_status.clone(); constructed_response
constructed_response.url_list = cached_resource.data.url_list.clone(); .raw_status
.clone_from(&cached_resource.data.raw_status);
constructed_response
.url_list
.clone_from(&cached_resource.data.url_list);
cached_resource.data.expires = get_response_expiry(&constructed_response); cached_resource.data.expires = get_response_expiry(&constructed_response);
let mut stored_headers = cached_resource.data.metadata.headers.lock().unwrap(); let mut stored_headers = cached_resource.data.metadata.headers.lock().unwrap();
stored_headers.extend(response.headers); stored_headers.extend(response.headers);

2
components/net/storage_thread.rs
View file

@ -226,7 +226,7 @@ impl StorageManager {
.send( .send(
data.get(&origin) data.get(&origin)
.and_then(|(_, entry)| entry.get(&name)) .and_then(|(_, entry)| entry.get(&name))
.map(String::clone), .cloned(),
) )
.unwrap(); .unwrap();
} }