diff --git a/src/whois.rs b/src/whois.rs index aa42be4..2687331 100644 --- a/src/whois.rs +++ b/src/whois.rs @@ -109,11 +109,11 @@ impl WhoisData { RegexQuery::new(String::from(r"(?i)(nameservers*:|name servers*:)(.*)")); let dnssec_regex = RegexQuery::new(String::from(r"(?i)(.*dnssec:)(.*)")); - let registrar = WhoisData::parse_whois(registrar_regex.get_matches(&result), 0); - let domain_status = WhoisData::parse_whois(domain_status_regex.get_matches(&result), 0); - let reg_name = WhoisData::parse_whois(registrant_name_regex.get_matches(&result), 0); - let reg_org = WhoisData::parse_whois(registrant_org_regex.get_matches(&result), 0); - let reg_email = WhoisData::parse_whois(registrant_email_regex.get_matches(&result), 0); + let registrar = WhoisData::return_regex(registrar_regex.get_matches(&result), 0); + let domain_status = WhoisData::return_regex(domain_status_regex.get_matches(&result), 0); + let reg_name = WhoisData::return_regex(registrant_name_regex.get_matches(&result), 0); + let reg_org = WhoisData::return_regex(registrant_org_regex.get_matches(&result), 0); + let reg_email = WhoisData::return_regex(registrant_email_regex.get_matches(&result), 0); let mut nameservers = vec![]; for nameserver in nameserver_regex.get_matches(&result) { @@ -137,7 +137,7 @@ impl WhoisData { } } - fn parse_whois(caps: Vec, index: usize) -> String { + fn return_regex(caps: Vec, index: usize) -> String { let data: String; match caps.get(index) { Some(tmp) => {