Skip to content

Commit c968e01

Browse files
committed
updated to use if-let-else
1 parent a5110df commit c968e01

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

crates/wasm-pkg-common/src/config.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,27 +191,21 @@ impl Config {
191191
/// - The default registry
192192
/// - Hard-coded fallbacks for certain well-known namespaces
193193
pub fn resolve_registry(&self, package: &PackageRef) -> Option<&Registry> {
194+
let namespace = package.namespace();
195+
// look in `self.package_registry_overrides `
196+
// then in `self.namespace_registries`
194197
if let Some(reg) = self
195198
.package_registry_overrides
196199
.get(package)
200+
.or_else(|| self.namespace_registries.get(namespace))
197201
.map(|pkg| pkg.registry())
198202
{
199203
return Some(reg);
200-
}
201-
202-
if let Some(reg) = self
203-
.namespace_registries
204-
.get(package.namespace())
205-
.map(RegistryMapping::get_registry)
206-
{
207-
return Some(reg);
208-
}
209-
210-
if let Some(reg) = self.default_registry.as_ref() {
204+
} else if let Some(reg) = self.default_registry.as_ref() {
211205
return Some(reg);
212206
}
213207

214-
self.fallback_namespace_registries.get(package.namespace())
208+
self.fallback_namespace_registries.get(namespace)
215209
}
216210

217211
/// Returns the default registry.

0 commit comments

Comments
 (0)