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

Auto merge of #6776 - notriddle:filereader-matches, r=jdm

Browse source 
Remove unnecessarily verbose matches.

Fixes #6766.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6776)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-26 00:18:10 -06:00
commit fd1bf1900d
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/script/dom/filereader.rs
View file

@ -227,33 +227,30 @@ impl FileReader {
fn perform_readastext(blob_body: BlobBody)
-> Result<Option<DOMString>, DOMErrorName> {
let blob_label = &blob_body.label;
let blob_type = &blob_body.blobtype;
let blob_bytes = &blob_body.bytes[..];
//https://w3c.github.io/FileAPI/#encoding-determination
// Steps 1 & 2 & 3
let mut encoding = match blob_body.label {
Some(e) => encoding_from_whatwg_label(&e),
None => None
};
let mut encoding = blob_label.as_ref()
.map(|string| &**string)
.and_then(encoding_from_whatwg_label);
// Step 4 & 5
encoding = match encoding {
Some(e) => Some(e),
None => {
let resultmime = blob_body.blobtype.parse::<Mime>().ok();
resultmime.and_then(|Mime(_, _, ref parameters)| {
parameters.iter()
.find(|&&(ref k, _)| &Attr::Charset == k)
.and_then(|&(_, ref v)| encoding_from_whatwg_label(&v.to_string()))
})
}
};
encoding = encoding.or_else(|| {
let resultmime = blob_type.parse::<Mime>().ok();
resultmime.and_then(|Mime(_, _, ref parameters)| {
parameters.iter()
.find(|&&(ref k, _)| &Attr::Charset == k)
.and_then(|&(_, ref v)| encoding_from_whatwg_label(&v.to_string()))
})
});
// Step 6
let enc = match encoding {
Some(code) => code,
None => UTF_8 as EncodingRef
};
let enc = encoding.unwrap_or(UTF_8 as EncodingRef);
let convert = &blob_body.bytes[..];
let convert = blob_bytes;
// Step 7
let output = enc.decode(convert, DecoderTrap::Replace).unwrap();
Ok(Some(output))