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

Auto merge of #16099 - nox:tungstenite, r=jdm

Browse source 
Properly follow the spec in WebSocket::Constructor

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16099)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-24 01:46:14 -07:00 • committed by GitHub
commit 189b0d9094
11 changed files with 183 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/platform/macos/font_template.rs
View file

@ -92,7 +92,7 @@ impl FontTemplateData {
.expect("No URL for Core Text font!")
.get_string()
.to_string()).expect("Couldn't parse Core Text font URL!")
.as_url().unwrap().to_file_path()
.as_url().to_file_path()
.expect("Core Text font didn't name a path!");
let mut bytes = Vec::new();
File::open(path).expect("Couldn't open font file!").read_to_end(&mut bytes).unwrap();