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

clippy: fix warnings in components/shared (#31565)

Browse source 
* clippy: fix some warnings in components/shared

* fix: unit tests

* fix: review comments
This commit is contained in:
eri 2024-03-08 16:28:19 +01:00 • committed by GitHub
parent 3a5ca785d3
commit 43f44965cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 102 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/shared/net/pub_domains.rs
View file

@ -21,7 +21,7 @@ use embedder_traits::resources::{self, Resource};
use lazy_static::lazy_static;
use servo_url::{Host, ImmutableOrigin, ServoUrl};
#[derive(Clone, Debug)]
#[derive(Clone, Debug, Default)]
pub struct PubDomainRules {
rules: HashSet<String>,
wildcards: HashSet<String>,
@ -37,12 +37,12 @@ impl<'a> FromIterator<&'a str> for PubDomainRules {
where
T: IntoIterator<Item = &'a str>,
{
let mut result = PubDomainRules::new();
let mut result = PubDomainRules::default();
for item in iter {
if item.starts_with("!") {
result.exceptions.insert(String::from(&item[1..]));
} else if item.starts_with("*.") {
result.wildcards.insert(String::from(&item[2..]));
if let Some(stripped) = item.strip_prefix('!') {
result.exceptions.insert(String::from(stripped));
} else if let Some(stripped) = item.strip_prefix("*.") {
result.wildcards.insert(String::from(stripped));
} else {
result.rules.insert(String::from(item));
}
@ -52,13 +52,6 @@ impl<'a> FromIterator<&'a str> for PubDomainRules {
}
impl PubDomainRules {
pub fn new() -> PubDomainRules {
PubDomainRules {
rules: HashSet::new(),
wildcards: HashSet::new(),
exceptions: HashSet::new(),
}
}
pub fn parse(content: &str) -> PubDomainRules {
content
.lines()
@ -68,23 +61,21 @@ impl PubDomainRules {
.collect()
}
fn suffix_pair<'a>(&self, domain: &'a str) -> (&'a str, &'a str) {
let domain = domain.trim_start_matches(".");
let domain = domain.trim_start_matches('.');
let mut suffix = domain;
let mut prev_suffix = domain;
for (index, _) in domain.match_indices(".") {
for (index, _) in domain.match_indices('.') {
let next_suffix = &domain[index + 1..];
if self.exceptions.contains(suffix) {
return (next_suffix, suffix);
} else if self.wildcards.contains(next_suffix) {
return (suffix, prev_suffix);
} else if self.rules.contains(suffix) {
return (suffix, prev_suffix);
} else {
prev_suffix = suffix;
suffix = next_suffix;
}
if self.wildcards.contains(next_suffix) || self.rules.contains(suffix) {
return (suffix, prev_suffix);
}
prev_suffix = suffix;
suffix = next_suffix;
}
return (suffix, prev_suffix);
(suffix, prev_suffix)
}
pub fn public_suffix<'a>(&self, domain: &'a str) -> &'a str {
let (public, _) = self.suffix_pair(domain);
@ -98,8 +89,8 @@ impl PubDomainRules {
// Speeded-up version of
// domain != "" &&
// self.public_suffix(domain) == domain.
let domain = domain.trim_start_matches(".");
match domain.find(".") {
let domain = domain.trim_start_matches('.');
match domain.find('.') {
None => !domain.is_empty(),
Some(index) => {
!self.exceptions.contains(domain) && self.wildcards.contains(&domain[index + 1..]) ||
@ -111,8 +102,8 @@ impl PubDomainRules {
// Speeded-up version of
// self.public_suffix(domain) != domain &&
// self.registrable_suffix(domain) == domain.
let domain = domain.trim_start_matches(".");
match domain.find(".") {
let domain = domain.trim_start_matches('.');
match domain.find('.') {
None => false,
Some(index) => {
self.exceptions.contains(domain) ||
@ -151,7 +142,7 @@ pub fn is_reg_domain(domain: &str) -> bool {
pub fn reg_host(url: &ServoUrl) -> Option<Host> {
match url.origin() {
ImmutableOrigin::Tuple(_, Host::Domain(domain), _) => {
Some(Host::Domain(String::from(reg_suffix(&*domain))))
Some(Host::Domain(String::from(reg_suffix(&domain))))
},
ImmutableOrigin::Tuple(_, ip, _) => Some(ip),
ImmutableOrigin::Opaque(_) => None,