From ae17f2cd114314550761f0d43da64c2a6622359a Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Tue, 30 May 2023 13:15:31 +0100 Subject: [PATCH] refactor: de-depulicate `make_dep_prefix` implementation --- src/cargo/sources/registry/mod.rs | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs index ee27df15d78..4143ac16371 100644 --- a/src/cargo/sources/registry/mod.rs +++ b/src/cargo/sources/registry/mod.rs @@ -1013,26 +1013,8 @@ fn max_unpack_size(config: &Config, size: u64) -> u64 { u64::max(max_unpack_size, size * max_compression_ratio as u64) } +/// Constructs a path to a dependency in the registry index on filesystem. +/// See [`cargo_util::registry::make_dep_path`] for more. fn make_dep_prefix(name: &str) -> String { - match name.len() { - 1 => String::from("1"), - 2 => String::from("2"), - 3 => format!("3/{}", &name[..1]), - _ => format!("{}/{}", &name[0..2], &name[2..4]), - } -} - -#[cfg(test)] -mod tests { - use super::make_dep_prefix; - - #[test] - fn dep_prefix() { - assert_eq!(make_dep_prefix("a"), "1"); - assert_eq!(make_dep_prefix("ab"), "2"); - assert_eq!(make_dep_prefix("abc"), "3/a"); - assert_eq!(make_dep_prefix("Abc"), "3/A"); - assert_eq!(make_dep_prefix("AbCd"), "Ab/Cd"); - assert_eq!(make_dep_prefix("aBcDe"), "aB/cD"); - } + cargo_util::registry::make_dep_path(name, true) }