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

Deduplicate idna, log, mime, mime_guess, percent-encoding, unicase, url, ws

Browse source
This commit is contained in:
Simon Sapin 2019-08-19 19:21:59 +02:00
parent 8fd06759dc
commit 8eb650bafd
4 changed files with 44 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,6 @@ use hyper::Method;
use hyper::StatusCode;
use ipc_channel::ipc::IpcReceiver;
use mime::{self, Mime};
use mime_guess::guess_mime_type;
use net_traits::blob_url_store::{parse_blob_url, BlobURLStoreError};
use net_traits::filemanager_thread::RelativePos;
use net_traits::request::{CredentialsMode, Destination, Referrer, Request, RequestMode};
@ -654,7 +653,7 @@ fn scheme_fetch(
}
// Set Content-Type header.
let mime = guess_mime_type(file_path);
let mime = mime_guess::from_path(file_path).first_or_octet_stream();
response.headers.typed_insert(ContentType::from(mime));
// Setup channel to receive cross-thread messages about the file fetch

9
components/net/filemanager_thread.rs
View file

@ -9,7 +9,6 @@ use headers::{ContentLength, ContentType, HeaderMap, HeaderMapExt};
use http::header::{self, HeaderValue};
use ipc_channel::ipc::{self, IpcSender};
use mime::{self, Mime};
use mime_guess::guess_mime_type_opt;
use net_traits::blob_url_store::{BlobBuf, BlobURLStoreError};
use net_traits::filemanager_thread::{FileManagerResult, FileManagerThreadMsg, FileOrigin};
use net_traits::filemanager_thread::{
@ -408,7 +407,7 @@ impl FileManagerStore {
);
let filename_path = Path::new(file_name);
let type_string = match guess_mime_type_opt(filename_path) {
let type_string = match mime_guess::from_path(filename_path).first() {
Some(x) => format!("{}", x),
None => "".to_string(),
};
@ -459,7 +458,7 @@ impl FileManagerStore {
.and_then(|osstr| osstr.to_str())
.map(|s| s.to_string());
let mime = guess_mime_type_opt(metadata.path.clone());
let mime = mime_guess::from_path(metadata.path.clone()).first();
let range = rel_pos.to_abs_range(metadata.size as usize);
let mut file = File::open(&metadata.path)
@ -582,7 +581,9 @@ impl FileManagerStore {
set_headers(
&mut response.headers,
metadata.size,
guess_mime_type_opt(metadata.path).unwrap_or(mime::TEXT_PLAIN),
mime_guess::from_path(metadata.path)
.first()
.unwrap_or(mime::TEXT_PLAIN),
filename,
);