Merge branch 'network-config-error' into 'main'

Delete tor_dirmgr::Error::BadNetworkConfig

See merge request tpo/core/arti!506

crates/tor-dirmgr/src/err.rs

@@ -30,9 +30,6 @@ pub enum Error {
     /// A schema version that says we can't read it.
     #[error("unrecognized data storage schema")]
     UnrecognizedSchema,
-    /// We couldn't configure the network.
-    #[error("bad network configuration")]
-    BadNetworkConfig(&'static str),
     /// User requested an operation that required a usable
     /// bootstrapped directory, but we didn't have one.
     #[error("directory not present or not up-to-date")]
@@ -163,7 +160,6 @@ impl Error {
             | Error::CachePermissions(_)
             | Error::SqliteError(_)
             | Error::UnrecognizedSchema
-            | Error::BadNetworkConfig(_)
             | Error::DirectoryNotPresent
             | Error::ManagerDropped
             | Error::CantAdvanceState
@@ -226,7 +222,6 @@ impl HasKind for Error {
             }
             E::SqliteError(e) => sqlite_error_kind(e),
             E::UnrecognizedSchema => EK::CacheCorrupted,
-            E::BadNetworkConfig(_) => EK::InvalidConfig,
             E::DirectoryNotPresent => EK::DirectoryExpired,
             E::NetDirOlder => EK::TorDirectoryError,
             E::BadUtf8FromDirectory(_) => EK::TorProtocolViolation,

doc/semver_status.md

@@ -34,6 +34,7 @@ MODIFIED: New APIs for CachedDir, Error.
 ### tor-dirmgr
 
 BREAKING: Added new cache_trust element to DirMgrConfig.
+BREAKING: Delete Error::BadNetworkConfig
 
 ### tor-netdoc