Closed lars-t-hansen closed 7 months ago
There is this conflict:
fn print_record<W: io::Write>(
writer: &mut Writer<W>,
params: &PrintParameters,
proc_info: &ProcInfo,
<<<<<<< HEAD
) -> Result<bool> {
let gpus_comma_separated = if let Some(ref cards) = proc_info.gpu_cards {
if cards.is_empty() {
"none".to_string()
} else {
cards
.iter()
.map(|&num| num.to_string())
.collect::<Vec<String>>()
.join(",")
}
} else {
"unknown".to_string()
};
||||||| 78d9dba
) -> bool {
let gpus_comma_separated = if let Some(ref cards) = proc_info.gpu_cards {
if cards.is_empty() {
"none".to_string()
} else {
cards
.iter()
.map(|&num| num.to_string())
.collect::<Vec<String>>()
.join(",")
}
} else {
"unknown".to_string()
};
=======
) -> bool {
// Mandatory fields.
>>>>>>> main
I believe here we want to replace bool
with Result<bool>
but we also want to remove the let gpus_...
call like it was done on main
?
I'll tidy it up and post a new patch.
@bast PTAL, should be OK now.
Thanks!
Thanks! I will just resolve conflicts and merge.