hsservice: Move derive_more::From out of internal_prelude.

This fixes an error from nightly. The trouble is that with nightly,
there's a now a [derive macro for From][issue].  That doesn't cause
a conflict when we `use derive_more::From`, but it _does_
cause a conflict when we import `derive_more::From` via
`use internal_prelude::*`.

So as a solution, we just import `derive_more::From` explicitly.

Closes #2124

[issue]: rust-lang/rust#144922

Author: nmathewson

crates/tor-hsservice/src/config/restricted_discovery.rs

@@ -100,6 +100,7 @@ pub use key_provider::{
 };
 
 use crate::internal_prelude::*;
+use derive_more::From;
 
 use std::collections::BTreeMap;
 use std::collections::btree_map::Entry;

crates/tor-hsservice/src/config/restricted_discovery/key_provider.rs

@@ -2,6 +2,7 @@
 
 use crate::config::restricted_discovery::HsClientNickname;
 use crate::internal_prelude::*;
+use derive_more::From;
 
 use std::collections::BTreeMap;
 use std::fs::DirEntry;

crates/tor-hsservice/src/internal_prelude.rs

@@ -46,7 +46,7 @@ pub(crate) use {
     async_trait::async_trait,
     derive_builder::Builder,
     derive_deftly::{Deftly, define_derive_deftly},
-    derive_more::{Constructor, Deref, DerefMut, From, Into},
+    derive_more::{Constructor, Deref, DerefMut, Into},
     educe::Educe,
     futures::channel::mpsc,
     futures::future::{self, Either},

crates/tor-hsservice/src/publish/reactor.rs

@@ -88,6 +88,7 @@ use crate::config::restricted_discovery::{
 use crate::status::{DescUploadRetryError, Problem};
 
 use super::*;
+use derive_more::From;
 
 // TODO-CLIENT-AUTH: perhaps we should add a separate CONFIG_CHANGE_REPUBLISH_DEBOUNCE_INTERVAL
 // for rate-limiting the publish jobs triggered by a change in the config?