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

Auto merge of #10662 - frewsxcv:resource-param, r=jdm

Browse source 
Make `read_resource_file` param simpler and more idiomatic.

`<P: AsRef<Path>>` is also what `File::open` uses as a generic type for
the parameter.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10662)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-17 10:40:30 +05:30
commit 9935e82de6
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/net/hsts.rs
View file

@ -112,7 +112,7 @@ impl HSTSList {
}
pub fn preload_hsts_domains() -> Option<HSTSList> {
read_resource_file(&["hsts_preload.json"]).ok().and_then(|bytes| {
read_resource_file("hsts_preload.json").ok().and_then(|bytes| {
from_utf8(&bytes).ok().and_then(|hsts_preload_content| {
HSTSList::new_from_preload(hsts_preload_content)
})

4
components/style/selector_matching.rs
View file

@ -38,7 +38,7 @@ lazy_static! {
// FIXME: presentational-hints.css should be at author origin with zero specificity.
// (Does it make a difference?)
for &filename in &["user-agent.css", "servo.css", "presentational-hints.css"] {
match read_resource_file(&[filename]) {
match read_resource_file(filename) {
Ok(res) => {
let ua_stylesheet = Stylesheet::from_bytes(
&res,
@ -65,7 +65,7 @@ lazy_static! {
lazy_static! {
pub static ref QUIRKS_MODE_STYLESHEET: Stylesheet<ServoSelectorImpl> = {
match read_resource_file(&["quirks-mode.css"]) {
match read_resource_file("quirks-mode.css") {
Ok(res) => {
Stylesheet::from_bytes(
&res,

8
components/util/resource_files.rs
View file

@ -5,7 +5,7 @@
use std::env;
use std::fs::File;
use std::io::{self, Read};
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex};
lazy_static! {
@ -57,11 +57,9 @@ pub fn resources_dir_path() -> PathBuf {
path
}
pub fn read_resource_file(relative_path_components: &[&str]) -> io::Result<Vec<u8>> {
pub fn read_resource_file<P: AsRef<Path>>(relative_path: P) -> io::Result<Vec<u8>> {
let mut path = resources_dir_path();
for component in relative_path_components {
path.push(component);
}
path.push(relative_path);
let mut file = try!(File::open(&path));
let mut data = Vec::new();
try!(file.read_to_end(&mut data));