diff --git a/services/dns/src/hw.rs b/services/dns/src/hw.rs index 23d9b7e4a..6b0a8f4c0 100644 --- a/services/dns/src/hw.rs +++ b/services/dns/src/hw.rs @@ -27,7 +27,7 @@ impl Dns { if let Ok(simple_ip) = name.parse::() { Ok(NetIpAddr::from(simple_ip)) } else { - let alloc_name = String::::from_str(name); + let alloc_name = String::from(name); let mut buf = Buffer::into_buf(alloc_name).or(Err(DnsResponseCode::UnknownError))?; buf.lend_mut(self.conn, Opcode::Lookup.to_u32().unwrap()) .or(Err(DnsResponseCode::UnknownError))?; diff --git a/services/dns/src/main.rs b/services/dns/src/main.rs index e7a1bddc8..d836d7545 100644 --- a/services/dns/src/main.rs +++ b/services/dns/src/main.rs @@ -542,7 +542,7 @@ fn main() -> ! { Some(Opcode::Lookup) => { let mut buf = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; - let name = buf.to_original::, _>().unwrap(); + let name = buf.to_original::().unwrap(); let name_std = std::string::String::from(name.as_str()); if let Some(cache_entry) = dns_cache.get(&name_std) { // pick a random entry diff --git a/services/dns/src/time.rs b/services/dns/src/time.rs index 686cd317a..d19382f2c 100644 --- a/services/dns/src/time.rs +++ b/services/dns/src/time.rs @@ -822,105 +822,105 @@ pub(crate) enum ValidatorOp { UxSeconds, } -fn tz_ux_validator(input: TextEntryPayload) -> Option { +fn tz_ux_validator(input: &TextEntryPayload) -> Option { let text_str = input.as_str(); match simple_kilofloat_parse(text_str) { Ok(input) => { if input < -12_000 || input > 14_000 { - return Some(ValidatorErr::from_str(t!("rtc.range_err", locales::LANG))); + return Some(ValidatorErr::from(t!("rtc.range_err", locales::LANG))); } } - _ => return Some(ValidatorErr::from_str(t!("rtc.integer_err", locales::LANG))), + _ => return Some(ValidatorErr::from(t!("rtc.integer_err", locales::LANG))), } None } -fn rtc_ux_validate_month(input: TextEntryPayload) -> Option { +fn rtc_ux_validate_month(input: &TextEntryPayload) -> Option { let text_str = input.as_str(); let input = match text_str.parse::() { Ok(input_int) => input_int, - _ => return Some(ValidatorErr::from_str(t!("rtc.integer_err", locales::LANG))), + _ => return Some(ValidatorErr::from(t!("rtc.integer_err", locales::LANG))), }; if input < 1 || input > 12 { - return Some(ValidatorErr::from_str(t!("rtc.range_err", locales::LANG))); + return Some(ValidatorErr::from(t!("rtc.range_err", locales::LANG))); } None } -fn rtc_ux_validate_day(input: TextEntryPayload) -> Option { +fn rtc_ux_validate_day(input: &TextEntryPayload) -> Option { let text_str = input.as_str(); let input = match text_str.parse::() { Ok(input_int) => input_int, - _ => return Some(ValidatorErr::from_str(t!("rtc.integer_err", locales::LANG))), + _ => return Some(ValidatorErr::from(t!("rtc.integer_err", locales::LANG))), }; if input < 1 || input > 31 { - return Some(ValidatorErr::from_str(t!("rtc.range_err", locales::LANG))); + return Some(ValidatorErr::from(t!("rtc.range_err", locales::LANG))); } None } -fn rtc_ux_validate_year(input: TextEntryPayload) -> Option { +fn rtc_ux_validate_year(input: &TextEntryPayload) -> Option { let text_str = input.as_str(); let input = match text_str.parse::() { Ok(input_int) => input_int, - _ => return Some(ValidatorErr::from_str(t!("rtc.integer_err", locales::LANG))), + _ => return Some(ValidatorErr::from(t!("rtc.integer_err", locales::LANG))), }; if input > 99 { - return Some(ValidatorErr::from_str(t!("rtc.range_err", locales::LANG))); + return Some(ValidatorErr::from(t!("rtc.range_err", locales::LANG))); } None } -fn rtc_ux_validate_hour(input: TextEntryPayload) -> Option { +fn rtc_ux_validate_hour(input: &TextEntryPayload) -> Option { let text_str = input.as_str(); let input = match text_str.parse::() { Ok(input_int) => input_int, - _ => return Some(ValidatorErr::from_str(t!("rtc.integer_err", locales::LANG))), + _ => return Some(ValidatorErr::from(t!("rtc.integer_err", locales::LANG))), }; if input > 23 { - return Some(ValidatorErr::from_str(t!("rtc.range_err", locales::LANG))); + return Some(ValidatorErr::from(t!("rtc.range_err", locales::LANG))); } None } -fn rtc_ux_validate_minute(input: TextEntryPayload) -> Option { +fn rtc_ux_validate_minute(input: &TextEntryPayload) -> Option { let text_str = input.as_str(); let input = match text_str.parse::() { Ok(input_int) => input_int, - _ => return Some(ValidatorErr::from_str(t!("rtc.integer_err", locales::LANG))), + _ => return Some(ValidatorErr::from(t!("rtc.integer_err", locales::LANG))), }; if input > 59 { - return Some(ValidatorErr::from_str(t!("rtc.range_err", locales::LANG))); + return Some(ValidatorErr::from(t!("rtc.range_err", locales::LANG))); } None } -fn rtc_ux_validate_seconds(input: TextEntryPayload) -> Option { +fn rtc_ux_validate_seconds(input: &TextEntryPayload) -> Option { let text_str = input.as_str(); let input = match text_str.parse::() { Ok(input_int) => input_int, - _ => return Some(ValidatorErr::from_str(t!("rtc.integer_err", locales::LANG))), + _ => return Some(ValidatorErr::from(t!("rtc.integer_err", locales::LANG))), }; if input > 59 { - return Some(ValidatorErr::from_str(t!("rtc.range_err", locales::LANG))); + return Some(ValidatorErr::from(t!("rtc.range_err", locales::LANG))); } None