mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Untry
This commit is contained in:
parent
7af5a7fd54
commit
316cd35767
34 changed files with 261 additions and 264 deletions
|
@ -36,7 +36,7 @@ impl NetworkConnector for HttpsConnector {
|
|||
|
||||
// Perform host replacement when making the actual TCP connection.
|
||||
let addr = &(&*replace_host(host), port);
|
||||
let stream = HttpStream(try!(TcpStream::connect(addr)));
|
||||
let stream = HttpStream(TcpStream::connect(addr)?);
|
||||
|
||||
if scheme == "http" {
|
||||
Ok(HttpsStream::Http(stream))
|
||||
|
|
|
@ -357,14 +357,14 @@ impl FileManagerStore {
|
|||
fn create_entry(&self, file_path: &Path, origin: &str) -> Result<SelectedFile, FileManagerThreadError> {
|
||||
use net_traits::filemanager_thread::FileManagerThreadError::FileSystemError;
|
||||
|
||||
let file = try!(File::open(file_path).map_err(|e| FileSystemError(e.to_string())));
|
||||
let metadata = try!(file.metadata().map_err(|e| FileSystemError(e.to_string())));
|
||||
let modified = try!(metadata.modified().map_err(|e| FileSystemError(e.to_string())));
|
||||
let elapsed = try!(modified.elapsed().map_err(|e| FileSystemError(e.to_string())));
|
||||
let file = File::open(file_path).map_err(|e| FileSystemError(e.to_string()))?;
|
||||
let metadata = file.metadata().map_err(|e| FileSystemError(e.to_string()))?;
|
||||
let modified = metadata.modified().map_err(|e| FileSystemError(e.to_string()))?;
|
||||
let elapsed = modified.elapsed().map_err(|e| FileSystemError(e.to_string()))?;
|
||||
// Unix Epoch: https://doc.servo.org/std/time/constant.UNIX_EPOCH.html
|
||||
let modified_epoch = elapsed.as_secs() * 1000 + elapsed.subsec_nanos() as u64 / 1000000;
|
||||
let file_size = metadata.len();
|
||||
let file_name = try!(file_path.file_name().ok_or(FileSystemError("Invalid filepath".to_string())));
|
||||
let file_name = file_path.file_name().ok_or(FileSystemError("Invalid filepath".to_string()))?;
|
||||
|
||||
let file_impl = FileImpl::MetaDataOnly(FileMetaData {
|
||||
path: file_path.to_path_buf(),
|
||||
|
@ -400,7 +400,7 @@ impl FileManagerStore {
|
|||
fn get_blob_buf(&self, sender: &IpcSender<FileManagerResult<ReadFileProgress>>,
|
||||
id: &Uuid, origin_in: &FileOrigin, rel_pos: RelativePos,
|
||||
check_url_validity: bool) -> Result<(), BlobURLStoreError> {
|
||||
let file_impl = try!(self.get_impl(id, origin_in, check_url_validity));
|
||||
let file_impl = self.get_impl(id, origin_in, check_url_validity)?;
|
||||
match file_impl {
|
||||
FileImpl::Memory(buf) => {
|
||||
let range = rel_pos.to_abs_range(buf.size as usize);
|
||||
|
@ -430,10 +430,10 @@ impl FileManagerStore {
|
|||
let mime = guess_mime_type_opt(metadata.path.clone());
|
||||
let range = rel_pos.to_abs_range(metadata.size as usize);
|
||||
|
||||
let mut file = try!(File::open(&metadata.path)
|
||||
.map_err(|e| BlobURLStoreError::External(e.to_string())));
|
||||
let seeked_start = try!(file.seek(SeekFrom::Start(range.start as u64))
|
||||
.map_err(|e| BlobURLStoreError::External(e.to_string())));
|
||||
let mut file = File::open(&metadata.path)
|
||||
.map_err(|e| BlobURLStoreError::External(e.to_string()))?;
|
||||
let seeked_start = file.seek(SeekFrom::Start(range.start as u64))
|
||||
.map_err(|e| BlobURLStoreError::External(e.to_string()))?;
|
||||
|
||||
if seeked_start == (range.start as u64) {
|
||||
let type_string = match mime {
|
||||
|
|
|
@ -317,7 +317,7 @@ impl StreamedResponse {
|
|||
fn from_http_response(response: WrappedHttpResponse) -> io::Result<StreamedResponse> {
|
||||
let decoder = match response.content_encoding() {
|
||||
Some(Encoding::Gzip) => {
|
||||
Decoder::Gzip(try!(GzDecoder::new(response)))
|
||||
Decoder::Gzip(GzDecoder::new(response)?)
|
||||
}
|
||||
Some(Encoding::Deflate) => {
|
||||
Decoder::Deflate(DeflateDecoder::new(response))
|
||||
|
@ -1340,7 +1340,7 @@ fn cors_check(request: &Request, response: &Response) -> Result<(), ()> {
|
|||
let origin = response.headers.get::<AccessControlAllowOrigin>().cloned();
|
||||
|
||||
// Step 2
|
||||
let origin = try!(origin.ok_or(()));
|
||||
let origin = origin.ok_or(())?;
|
||||
|
||||
// Step 3
|
||||
if request.credentials_mode != CredentialsMode::Include &&
|
||||
|
|
|
@ -53,9 +53,9 @@ fn decode_bytes_sync(key: LoadKey, bytes: &[u8]) -> DecoderMsg {
|
|||
}
|
||||
|
||||
fn get_placeholder_image(webrender_api: &webrender_traits::RenderApi, path: &PathBuf) -> io::Result<Arc<Image>> {
|
||||
let mut file = try!(File::open(path));
|
||||
let mut file = File::open(path)?;
|
||||
let mut image_data = vec![];
|
||||
try!(file.read_to_end(&mut image_data));
|
||||
file.read_to_end(&mut image_data)?;
|
||||
let mut image = load_from_memory(&image_data).unwrap();
|
||||
set_webrender_image_key(webrender_api, &mut image);
|
||||
Ok(Arc::new(image))
|
||||
|
|
|
@ -169,14 +169,14 @@ impl MimeClassifier {
|
|||
}
|
||||
|
||||
pub fn validate(&self) -> Result<(), String> {
|
||||
try!(self.image_classifier.validate());
|
||||
try!(self.audio_video_classifier.validate());
|
||||
try!(self.scriptable_classifier.validate());
|
||||
try!(self.plaintext_classifier.validate());
|
||||
try!(self.archive_classifier.validate());
|
||||
try!(self.binary_or_plaintext.validate());
|
||||
try!(self.feeds_classifier.validate());
|
||||
try!(self.font_classifier.validate());
|
||||
self.image_classifier.validate()?;
|
||||
self.audio_video_classifier.validate()?;
|
||||
self.scriptable_classifier.validate()?;
|
||||
self.plaintext_classifier.validate()?;
|
||||
self.archive_classifier.validate()?;
|
||||
self.binary_or_plaintext.validate()?;
|
||||
self.feeds_classifier.validate()?;
|
||||
self.font_classifier.validate()?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@ -547,7 +547,7 @@ impl MIMEChecker for GroupedClassifier {
|
|||
|
||||
fn validate(&self) -> Result<(), String> {
|
||||
for byte_matcher in &self.byte_matchers {
|
||||
try!(byte_matcher.validate())
|
||||
byte_matcher.validate()?
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue