diff options
author | est31 <MTest31@outlook.com> | 2019-06-02 02:44:37 +0200 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2019-06-02 02:44:37 +0200 |
commit | fe58aca75de6853cb7e14e09dd93fa31c6bef7c8 (patch) | |
tree | f64271f74ad2c0ee75d424155927aad03bd61246 | |
parent | 8dc7a25893cbe9a2c958966618d28757201899b6 (diff) | |
download | servo-fe58aca75de6853cb7e14e09dd93fa31c6bef7c8.tar.gz servo-fe58aca75de6853cb7e14e09dd93fa31c6bef7c8.zip |
Remove unused code from net and net_traits crates
-rw-r--r-- | components/net/fetch/cors_cache.rs | 10 | ||||
-rw-r--r-- | components/net/http_cache.rs | 5 | ||||
-rw-r--r-- | components/net/image_cache.rs | 5 | ||||
-rw-r--r-- | components/net_traits/filemanager_thread.rs | 8 | ||||
-rw-r--r-- | components/net_traits/image_cache.rs | 3 | ||||
-rw-r--r-- | components/net_traits/lib.rs | 1 | ||||
-rw-r--r-- | components/net_traits/net_error_list.rs | 203 | ||||
-rw-r--r-- | components/net_traits/request.rs | 18 | ||||
-rw-r--r-- | components/net_traits/response.rs | 6 |
9 files changed, 0 insertions, 259 deletions
diff --git a/components/net/fetch/cors_cache.rs b/components/net/fetch/cors_cache.rs index f9e06c937bc..0a809529c69 100644 --- a/components/net/fetch/cors_cache.rs +++ b/components/net/fetch/cors_cache.rs @@ -108,16 +108,6 @@ impl CorsCache { .find(|e| match_headers(e, request) && e.header_or_method.match_method(&method)) } - /// [Clear the cache](https://fetch.spec.whatwg.org/#concept-cache-clear) - pub fn clear(&mut self, request: &Request) { - let CorsCache(buf) = self.clone(); - let new_buf: Vec<CorsCacheEntry> = buf - .into_iter() - .filter(|e| e.origin == request.origin && request.current_url() == e.url) - .collect(); - *self = CorsCache(new_buf); - } - /// Remove old entries pub fn cleanup(&mut self) { let CorsCache(buf) = self.clone(); diff --git a/components/net/http_cache.rs b/components/net/http_cache.rs index 9e430ceea3e..a228bd39004 100644 --- a/components/net/http_cache.rs +++ b/components/net/http_cache.rs @@ -48,11 +48,6 @@ impl CacheKey { url: servo_url.clone(), } } - - /// Retrieve the URL associated with this key - pub fn url(&self) -> ServoUrl { - self.url.clone() - } } /// A complete cached resource. diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs index 8b3a4f56c7d..e610be15412 100644 --- a/components/net/image_cache.rs +++ b/components/net/image_cache.rs @@ -535,9 +535,4 @@ impl ImageCache for ImageCacheImpl { }, } } - - /// Ensure an image has a webrender key. - fn set_webrender_image_key(&self, image: &mut Image) { - set_webrender_image_key(&self.store.lock().unwrap().webrender_api, image); - } } diff --git a/components/net_traits/filemanager_thread.rs b/components/net_traits/filemanager_thread.rs index d4ee9ed6b1a..25a651eea29 100644 --- a/components/net_traits/filemanager_thread.rs +++ b/components/net_traits/filemanager_thread.rs @@ -90,14 +90,6 @@ impl RelativePos { end: (start + span).to_usize().unwrap(), } } - - /// Inverse operation of to_abs_range - pub fn from_abs_range(range: Range<usize>, size: usize) -> RelativePos { - RelativePos { - start: range.start as i64, - end: Some(size as i64 - range.end as i64), - } - } } /// Response to file selection request diff --git a/components/net_traits/image_cache.rs b/components/net_traits/image_cache.rs index 4b4aa1a1862..29b7cae972c 100644 --- a/components/net_traits/image_cache.rs +++ b/components/net_traits/image_cache.rs @@ -120,7 +120,4 @@ pub trait ImageCache: Sync + Send { /// Inform the image cache about a response for a pending request. fn notify_pending_response(&self, id: PendingImageId, action: FetchResponseMsg); - - /// Ensure an image has a webrender key. - fn set_webrender_image_key(&self, image: &mut Image); } diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 853692da33c..8bbd72bdbb5 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -41,7 +41,6 @@ use url::percent_encoding; pub mod blob_url_store; pub mod filemanager_thread; pub mod image_cache; -pub mod net_error_list; pub mod pub_domains; pub mod quality; pub mod request; diff --git a/components/net_traits/net_error_list.rs b/components/net_traits/net_error_list.rs deleted file mode 100644 index a455c13b9d8..00000000000 --- a/components/net_traits/net_error_list.rs +++ /dev/null @@ -1,203 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -// see https://github.com/adobe/chromium/blob/master/net/base/net_error_list.h -#[allow(dead_code, non_camel_case_types)] -pub enum NetError { - IO_PENDING = 1, - FAILED = 2, - ABORTED = 3, - INVALID_ARGUMENT = 4, - INVALID_HANDLE = 5, - FILE_NOT_FOUND = 6, - TIMED_OUT = 7, - FILE_TOO_BIG = 8, - UNEXPECTED = 9, - ACCESS_DENIED = 10, - NOT_IMPLEMENTED = 11, - INSUFFICIENT_RESOURCES = 12, - OUT_OF_MEMORY = 13, - UPLOAD_FILE_CHANGED = 14, - SOCKET_NOT_CONNECTED = 15, - FILE_EXISTS = 16, - FILE_PATH_TOO_LONG = 17, - FILE_NO_SPACE = 18, - FILE_VIRUS_INFECTED = 19, - BLOCKED_BY_CLIENT = 20, - NETWORK_CHANGED = 21, - BLOCKED_BY_ADMINISTRATOR = 22, - SOCKET_IS_CONNECTED = 23, - BLOCKED_ENROLLMENT_CHECK_PENDING = 24, - UPLOAD_STREAM_REWIND_NOT_SUPPORTED = 25, - CONNECTION_CLOSED = 100, - CONNECTION_RESET = 101, - CONNECTION_REFUSED = 102, - CONNECTION_ABORTED = 103, - CONNECTION_FAILED = 104, - NAME_NOT_RESOLVED = 105, - INTERNET_DISCONNECTED = 106, - SSL_PROTOCOL_ERROR = 107, - ADDRESS_INVALID = 108, - ADDRESS_UNREACHABLE = 109, - SSL_CLIENT_AUTH_CERT_NEEDED = 110, - TUNNEL_CONNECTION_FAILED = 111, - NO_SSL_VERSIONS_ENABLED = 112, - SSL_VERSION_OR_CIPHER_MISMATCH = 113, - SSL_RENEGOTIATION_REQUESTED = 114, - PROXY_AUTH_UNSUPPORTED = 115, - CERT_ERROR_IN_SSL_RENEGOTIATION = 116, - BAD_SSL_CLIENT_AUTH_CERT = 117, - CONNECTION_TIMED_OUT = 118, - HOST_RESOLVER_QUEUE_TOO_LARGE = 119, - SOCKS_CONNECTION_FAILED = 120, - SOCKS_CONNECTION_HOST_UNREACHABLE = 121, - NPN_NEGOTIATION_FAILED = 122, - SSL_NO_RENEGOTIATION = 123, - WINSOCK_UNEXPECTED_WRITTEN_BYTES = 124, - SSL_DECOMPRESSION_FAILURE_ALERT = 125, - SSL_BAD_RECORD_MAC_ALERT = 126, - PROXY_AUTH_REQUESTED = 127, - SSL_UNSAFE_NEGOTIATION = 128, - SSL_WEAK_SERVER_EPHEMERAL_DH_KEY = 129, - PROXY_CONNECTION_FAILED = 130, - MANDATORY_PROXY_CONFIGURATION_FAILED = 131, - PRECONNECT_MAX_SOCKET_LIMIT = 133, - SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED = 134, - SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY = 135, - PROXY_CERTIFICATE_INVALID = 136, - NAME_RESOLUTION_FAILED = 137, - NETWORK_ACCESS_DENIED = 138, - TEMPORARILY_THROTTLED = 139, - HTTPS_PROXY_TUNNEL_RESPONSE = 140, - SSL_CLIENT_AUTH_SIGNATURE_FAILED = 141, - MSG_TOO_BIG = 142, - SPDY_SESSION_ALREADY_EXISTS = 143, - WS_PROTOCOL_ERROR = 145, - ADDRESS_IN_USE = 147, - SSL_HANDSHAKE_NOT_COMPLETED = 148, - SSL_BAD_PEER_PUBLIC_KEY = 149, - SSL_PINNED_KEY_NOT_IN_CERT_CHAIN = 150, - CLIENT_AUTH_CERT_TYPE_UNSUPPORTED = 151, - ORIGIN_BOUND_CERT_GENERATION_TYPE_MISMATCH = 152, - SSL_DECRYPT_ERROR_ALERT = 153, - WS_THROTTLE_QUEUE_TOO_LARGE = 154, - SSL_SERVER_CERT_CHANGED = 156, - SSL_INAPPROPRIATE_FALLBACK = 157, - CT_NO_SCTS_VERIFIED_OK = 158, - SSL_UNRECOGNIZED_NAME_ALERT = 159, - SOCKET_SET_RECEIVE_BUFFER_SIZE_ERROR = 160, - SOCKET_SET_SEND_BUFFER_SIZE_ERROR = 161, - SOCKET_RECEIVE_BUFFER_SIZE_UNCHANGEABLE = 162, - SOCKET_SEND_BUFFER_SIZE_UNCHANGEABLE = 163, - SSL_CLIENT_AUTH_CERT_BAD_FORMAT = 164, - SSL_FALLBACK_BEYOND_MINIMUM_VERSION = 165, - CERT_COMMON_NAME_INVALID = 200, - CERT_DATE_INVALID = 201, - CERT_AUTHORITY_INVALID = 202, - CERT_CONTAINS_ERRORS = 203, - CERT_NO_REVOCATION_MECHANISM = 204, - CERT_UNABLE_TO_CHECK_REVOCATION = 205, - CERT_REVOKED = 206, - CERT_INVALID = 207, - CERT_WEAK_SIGNATURE_ALGORITHM = 208, - CERT_NON_UNIQUE_NAME = 210, - CERT_WEAK_KEY = 211, - CERT_NAME_CONSTRAINT_VIOLATION = 212, - CERT_VALIDITY_TOO_LONG = 213, - CERT_END = 214, - INVALID_URL = 300, - DISALLOWED_URL_SCHEME = 301, - UNKNOWN_URL_SCHEME = 302, - TOO_MANY_REDIRECTS = 310, - UNSAFE_REDIRECT = 311, - UNSAFE_PORT = 312, - INVALID_RESPONSE = 320, - INVALID_CHUNKED_ENCODING = 321, - METHOD_NOT_SUPPORTED = 322, - UNEXPECTED_PROXY_AUTH = 323, - EMPTY_RESPONSE = 324, - RESPONSE_HEADERS_TOO_BIG = 325, - PAC_STATUS_NOT_OK = 326, - PAC_SCRIPT_FAILED = 327, - REQUEST_RANGE_NOT_SATISFIABLE = 328, - MALFORMED_IDENTITY = 329, - CONTENT_DECODING_FAILED = 330, - NETWORK_IO_SUSPENDED = 331, - SYN_REPLY_NOT_RECEIVED = 332, - ENCODING_CONVERSION_FAILED = 333, - UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT = 334, - INVALID_SPDY_STREAM = 335, - NO_SUPPORTED_PROXIES = 336, - SPDY_PROTOCOL_ERROR = 337, - INVALID_AUTH_CREDENTIALS = 338, - UNSUPPORTED_AUTH_SCHEME = 339, - ENCODING_DETECTION_FAILED = 340, - MISSING_AUTH_CREDENTIALS = 341, - UNEXPECTED_SECURITY_LIBRARY_STATUS = 342, - MISCONFIGURED_AUTH_ENVIRONMENT = 343, - UNDOCUMENTED_SECURITY_LIBRARY_STATUS = 344, - RESPONSE_BODY_TOO_BIG_TO_DRAIN = 345, - RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH = 346, - INCOMPLETE_SPDY_HEADERS = 347, - PAC_NOT_IN_DHCP = 348, - RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION = 349, - RESPONSE_HEADERS_MULTIPLE_LOCATION = 350, - SPDY_SERVER_REFUSED_STREAM = 351, - SPDY_PING_FAILED = 352, - CONTENT_LENGTH_MISMATCH = 354, - INCOMPLETE_CHUNKED_ENCODING = 355, - QUIC_PROTOCOL_ERROR = 356, - RESPONSE_HEADERS_TRUNCATED = 357, - QUIC_HANDSHAKE_FAILED = 358, - REQUEST_FOR_SECURE_RESOURCE_OVER_INSECURE_QUIC = 359, - SPDY_INADEQUATE_TRANSPORT_SECURITY = 360, - SPDY_FLOW_CONTROL_ERROR = 361, - SPDY_FRAME_SIZE_ERROR = 362, - SPDY_COMPRESSION_ERROR = 363, - PROXY_AUTH_REQUESTED_WITH_NO_CONNECTION = 364, - HTTP_1_1_REQUIRED = 365, - PROXY_HTTP_1_1_REQUIRED = 366, - CACHE_MISS = 400, - CACHE_READ_FAILURE = 401, - CACHE_WRITE_FAILURE = 402, - CACHE_OPERATION_NOT_SUPPORTED = 403, - CACHE_OPEN_FAILURE = 404, - CACHE_CREATE_FAILURE = 405, - CACHE_RACE = 406, - CACHE_CHECKSUM_READ_FAILURE = 407, - CACHE_CHECKSUM_MISMATCH = 408, - CACHE_LOCK_TIMEOUT = 409, - INSECURE_RESPONSE = 501, - NO_PRIVATE_KEY_FOR_CERT = 502, - ADD_USER_CERT_FAILED = 503, - FTP_FAILED = 601, - FTP_SERVICE_UNAVAILABLE = 602, - FTP_TRANSFER_ABORTED = 603, - FTP_FILE_BUSY = 604, - FTP_SYNTAX_ERROR = 605, - FTP_COMMAND_NOT_SUPPORTED = 606, - FTP_BAD_COMMAND_SEQUENCE = 607, - PKCS12_IMPORT_BAD_PASSWORD = 701, - PKCS12_IMPORT_FAILED = 702, - IMPORT_CA_CERT_NOT_CA = 703, - IMPORT_CERT_ALREADY_EXISTS = 704, - IMPORT_CA_CERT_FAILED = 705, - IMPORT_SERVER_CERT_FAILED = 706, - PKCS12_IMPORT_INVALID_MAC = 707, - PKCS12_IMPORT_INVALID_FILE = 708, - PKCS12_IMPORT_UNSUPPORTED = 709, - KEY_GENERATION_FAILED = 710, - ORIGIN_BOUND_CERT_GENERATION_FAILED = 711, - PRIVATE_KEY_EXPORT_FAILED = 712, - SELF_SIGNED_CERT_GENERATION_FAILED = 713, - CERT_DATABASE_CHANGED = 714, - CHANNEL_ID_IMPORT_FAILED = 715, - DNS_MALFORMED_RESPONSE = 800, - DNS_SERVER_REQUIRES_TCP = 801, - DNS_SERVER_FAILED = 802, - DNS_TIMED_OUT = 803, - DNS_CACHE_MISS = 804, - DNS_SEARCH_EMPTY = 805, - DNS_SORT_ERROR = 806, -} diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs index 18cbb7fa661..cfceb5ee888 100644 --- a/components/net_traits/request.rs +++ b/components/net_traits/request.rs @@ -227,14 +227,6 @@ impl RequestBuilder { self } - pub fn service_workers_mode( - mut self, - service_workers_mode: ServiceWorkersMode, - ) -> RequestBuilder { - self.service_workers_mode = service_workers_mode; - self - } - pub fn destination(mut self, destination: Destination) -> RequestBuilder { self.destination = destination; self @@ -250,11 +242,6 @@ impl RequestBuilder { self } - pub fn cache_mode(mut self, cache_mode: CacheMode) -> RequestBuilder { - self.cache_mode = cache_mode; - self - } - pub fn use_cors_preflight(mut self, use_cors_preflight: bool) -> RequestBuilder { self.use_cors_preflight = use_cors_preflight; self @@ -300,11 +287,6 @@ impl RequestBuilder { self } - pub fn url_list(mut self, url_list: Vec<ServoUrl>) -> RequestBuilder { - self.url_list = url_list; - self - } - pub fn parser_metadata(mut self, parser_metadata: ParserMetadata) -> RequestBuilder { self.parser_metadata = parser_metadata; self diff --git a/components/net_traits/response.rs b/components/net_traits/response.rs index 9a6c1226db8..2656b5187f5 100644 --- a/components/net_traits/response.rs +++ b/components/net_traits/response.rs @@ -69,12 +69,6 @@ pub enum HttpsState { Modern, } -pub enum ResponseMsg { - Chunk(Vec<u8>), - Finished, - Errored, -} - #[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)] pub struct ResponseInit { pub url: ServoUrl, |