Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

clippy fixes

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-04-05 15:08:35 +02:00
parent 3e515dbc7d
commit 72dc88fb71
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/deb822/release_file.rs
View File

@ -100,7 +100,7 @@ impl FileReferenceType {
.ok_or_else(|| format_err!("Doesn't start with component '{component}'"))?; .ok_or_else(|| format_err!("Doesn't start with component '{component}'"))?;
let parse_binary_dir = |file_name: &str, arch: &str| { let parse_binary_dir = |file_name: &str, arch: &str| {
if let Some((dir, _rest)) = file_name.split_once("/") { if let Some((dir, _rest)) = file_name.split_once('/') {
if dir == "Packages.diff" { if dir == "Packages.diff" {
// TODO re-evaluate? // TODO re-evaluate?
Ok(FileReferenceType::PDiff) Ok(FileReferenceType::PDiff)
@ -121,12 +121,12 @@ impl FileReferenceType {
} }
}; };
if let Some((dir, rest)) = rest.split_once("/") { if let Some((dir, rest)) = rest.split_once('/') {
// reference into another subdir // reference into another subdir
match dir { match dir {
"source" => { "source" => {
// Sources or compat-Release // Sources or compat-Release
if let Some((dir, _rest)) = rest.split_once("/") { if let Some((dir, _rest)) = rest.split_once('/') {
if dir == "Sources.diff" { if dir == "Sources.diff" {
Ok(FileReferenceType::PDiff) Ok(FileReferenceType::PDiff)
} else { } else {
@ -152,7 +152,7 @@ impl FileReferenceType {
} }
"debian-installer" => { "debian-installer" => {
// another layer, then like regular repo but pointing at udebs // another layer, then like regular repo but pointing at udebs
if let Some((dir, rest)) = rest.split_once("/") { if let Some((dir, rest)) = rest.split_once('/') {
if let Some(arch) = dir.strip_prefix("binary-") { if let Some(arch) = dir.strip_prefix("binary-") {
// Packages or compat-Release // Packages or compat-Release
return parse_binary_dir(rest, arch); return parse_binary_dir(rest, arch);
@ -163,7 +163,7 @@ impl FileReferenceType {
Ok(FileReferenceType::Unknown) Ok(FileReferenceType::Unknown)
} }
"i18n" => { "i18n" => {
if let Some((dir, _rest)) = rest.split_once("/") { if let Some((dir, _rest)) = rest.split_once('/') {
if dir.starts_with("Translation") && dir.ends_with(".diff") { if dir.starts_with("Translation") && dir.ends_with(".diff") {
Ok(FileReferenceType::PDiff) Ok(FileReferenceType::PDiff)
} else { } else {
@ -197,7 +197,7 @@ impl FileReferenceType {
} else { } else {
(rest, false) (rest, false)
}; };
let (arch, comp) = match rest.split_once(".") { let (arch, comp) = match rest.split_once('.') {
Some((arch, comp_str)) => ( Some((arch, comp_str)) => (
arch.to_owned(), arch.to_owned(),
FileReferenceType::match_compression(comp_str)?, FileReferenceType::match_compression(comp_str)?,
@ -230,10 +230,7 @@ impl FileReferenceType {
} }
pub fn is_package_index(&self) -> bool { pub fn is_package_index(&self) -> bool {
match self { matches!(self, FileReferenceType::Packages(_, _))
FileReferenceType::Packages(_, _) => true,
_ => false,
}
} }
} }
@ -252,7 +249,7 @@ impl FileReference {
Some(_) => { Some(_) => {
let (base, _ext) = self let (base, _ext) = self
.path .path
.rsplit_once(".") .rsplit_once('.')
.ok_or_else(|| format_err!("compressed file without file extension"))?; .ok_or_else(|| format_err!("compressed file without file extension"))?;
Ok(base.to_owned()) Ok(base.to_owned())
} }