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

Reduce duplication

Browse source
This commit is contained in:
Bogdan Cuza 2015-04-13 22:32:16 +03:00
parent 19ffab82f1
commit ce4b8a0af7
1 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/net/resource_task.rs
View file

@ -79,33 +79,14 @@ pub fn start_sending_sniffed_opt(start_chan: Sender<LoadResponse>, mut metadata:
let nosniff = false;
let check_for_apache_bug = false;
metadata.content_type = match metadata.content_type {
Some(ContentType(Mime(toplevel, sublevel, _))) => {
let content_type = classifier.classify(nosniff, check_for_apache_bug,
&Some((format!("{}", toplevel), format!("{}", sublevel))), &partial_body);
match content_type {
Some((tp, sb)) => {
let mime_tp: TopLevel = FromStr::from_str(&tp).unwrap();
let mime_sb: SubLevel = FromStr::from_str(&sb).unwrap();
Some(ContentType(Mime(mime_tp, mime_sb, vec!())))
}
None => None
}
}
None => {
let content_type = classifier.classify(nosniff, check_for_apache_bug,
&None, &partial_body);
match content_type {
Some((tp, sb)) => {
let mime_tp: TopLevel = FromStr::from_str(&tp).unwrap();
let mime_sb: SubLevel = FromStr::from_str(&sb).unwrap();
Some(ContentType(Mime(mime_tp, mime_sb, vec!())))
}
None => None
}
}
}
let supplied_type = metadata.content_type.map(|ContentType(Mime(toplevel, sublevel, _))| {
(format!("{}", toplevel), format!("{}", sublevel))
});
metadata.content_type = classifier.classify(nosniff, check_for_apache_bug, &supplied_type, &partial_body).map(|(toplevel, sublevel)| {
let mime_tp: TopLevel = FromStr::from_str(&toplevel).unwrap();
let mime_sb: SubLevel = FromStr::from_str(&sublevel).unwrap();
ContentType(Mime(mime_tp, mime_sb, vec!()))
});
}