timeshifter/pacdef_rust
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refact(rustup): Refactor component installation

Browse Source 
Signed-off-by: innocentzero <isfarulhaque@proton.me>
This commit is contained in:
innocentzero
2024-04-02 04:51:15 +05:30
parent c03baf221f
commit ff25f2f55d
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pacdef_core/src/backend/actual/rustup.rs
+27 -16
View File
@@ -149,22 +149,8 @@ impl Rustup {
let mut cmd = Command::new(self.get_binary());
cmd.args(args).arg(&toolchain);
let output = String::from_utf8(cmd.output()?.stdout)?;
for i in output.lines() {
let mut it = i.splitn(3, "-");
let component = it.next().expect("Component name is empty!");
match component {
"cargo" | "rustfmt" | "clippy" | "miri" | "rls" | "rustc" => {
val.push([toolchain, component].join("/"));
}
_ => {
let component = [
component,
it.next().expect("No such component is managed by rustup"),
]
.join("-");
val.push([toolchain, component.as_str()].join("/"));
}
}
for line in output.lines() {
install_components(line, toolchain, &mut val);
}
}
Ok(val)
@@ -181,6 +167,7 @@ impl Rustup {
Ok(val)
}
}
fn get_install_switches(repotype: &str) -> Switches {
match repotype {
"toolchain" => &["toolchain", "install"],
@@ -188,6 +175,7 @@ fn get_install_switches(repotype: &str) -> Switches {
_ => panic!("No such type managed by rust"),
}
}
fn get_remove_switches(repotype: &str) -> Switches {
match repotype {
"toolchain" => &["toolchain", "uninstall"],
@@ -195,6 +183,7 @@ fn get_remove_switches(repotype: &str) -> Switches {
_ => panic!("No such type managed by rust"),
}
}
fn get_info_switches(repotype: &str) -> Switches {
match repotype {
"toolchain" => &["toolchain", "list"],
@@ -202,3 +191,25 @@ fn get_info_switches(repotype: &str) -> Switches {
_ => panic!("No such type managed by rust"),
}
}
fn install_components(line: &str, toolchain: &str, val: &mut Vec<String>) {
let mut chunks = line.splitn(3, '-');
let component = chunks.next().expect("Component name is empty!");
match component {
// these are the only components that have a single word name
"cargo" | "rustfmt" | "clippy" | "miri" | "rls" | "rustc" => {
val.push([toolchain, component].join("/"));
}
// all the others have two words hyphenated as component names
_ => {
let component = [
component,
chunks
.next()
.expect("No such component is managed by rustup"),
]
.join("-");
val.push([toolchain, component.as_str()].join("/"));
}
}
}