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

Auto merge of #7352 - saratang:issue_7347, r=Ms2ger

Browse source 
BinaryOrPlaintextClassifier::classify_impl does not need to return Option

Fixes for Issue #7347, though I wasn't sure how to test my code afterwards.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7352)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-26 05:53:38 -06:00
commit 78d72f6a9b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/net/mime_classifier.rs
View file

@ -277,28 +277,28 @@ impl MIMEChecker for Mp4Matcher {
struct BinaryOrPlaintextClassifier;
impl BinaryOrPlaintextClassifier {
fn classify_impl(&self, data: &[u8]) -> Option<(&'static str, &'static str)> {
fn classify_impl(&self, data: &[u8]) -> (&'static str, &'static str) {
if (data.len() >= 2 &&
((data[0] == 0xFFu8 && data[1] == 0xFEu8) ||
(data[0] == 0xFEu8 && data[1] == 0xFFu8))) ||
(data.len() >= 3 && data[0] == 0xEFu8 && data[1] == 0xBBu8 && data[2] == 0xBFu8)
{
Some(("text", "plain"))
("text", "plain")
}
else if data.len() >= 1 && data.iter().any(|&x| x <= 0x08u8 ||
x == 0x0Bu8 ||
(x >= 0x0Eu8 && x <= 0x1Au8) ||
(x >= 0x1Cu8 && x <= 0x1Fu8)) {
Some(("application", "octet-stream"))
("application", "octet-stream")
}
else {
Some(("text", "plain"))
("text", "plain")
}
}
}
impl MIMEChecker for BinaryOrPlaintextClassifier {
fn classify(&self, data: &[u8]) -> Option<(String, String)> {
return as_string_option(self.classify_impl(data));
return as_string_option(Some(self.classify_impl(data)));
}
}
struct GroupedClassifier {