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

Rustfmt net_traits.

Browse source
This commit is contained in:
Ms2ger 2017-01-03 14:31:48 +01:00
parent b76613a389
commit b46846e2a0
9 changed files with 151 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/net_traits/pub_domains.rs
View file

@ -32,7 +32,9 @@ lazy_static! {
}
impl<'a> FromIterator<&'a str> for PubDomainRules {
fn from_iter<T>(iter: T) -> Self where T: IntoIterator<Item=&'a str> {
fn from_iter<T>(iter: T) -> Self
where T: IntoIterator<Item = &'a str>,
{
let mut result = PubDomainRules::new();
for item in iter {
if item.starts_with("!") {
@ -96,9 +98,10 @@ impl PubDomainRules {
let domain = domain.trim_left_matches(".");
match domain.find(".") {
None => !domain.is_empty(),
Some(index) => !self.exceptions.contains(domain) &&
self.wildcards.contains(&domain[index + 1..]) ||
self.rules.contains(domain),
Some(index) => {
!self.exceptions.contains(domain) && self.wildcards.contains(&domain[index + 1..]) ||
self.rules.contains(domain)
},
}
}
pub fn is_registrable_suffix(&self, domain: &str) -> bool {
@ -108,19 +111,18 @@ impl PubDomainRules {
let domain = domain.trim_left_matches(".");
match domain.find(".") {
None => false,
Some(index) => self.exceptions.contains(domain) ||
!self.wildcards.contains(&domain[index + 1..]) &&
!self.rules.contains(domain) &&
self.is_public_suffix(&domain[index + 1..]),
Some(index) => {
self.exceptions.contains(domain) ||
!self.wildcards.contains(&domain[index + 1..]) && !self.rules.contains(domain) &&
self.is_public_suffix(&domain[index + 1..])
},
}
}
}
fn load_pub_domains() -> PubDomainRules {
let content = read_resource_file("public_domains.txt")
.expect("Could not find public suffix list file");
let content = from_utf8(&content)
.expect("Could not read public suffix list file");
let content = read_resource_file("public_domains.txt").expect("Could not find public suffix list file");
let content = from_utf8(&content).expect("Could not read public suffix list file");
PubDomainRules::parse(content)
}