diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/problem.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/rule.rs | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index 874d56e..47cf3b5 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -1153,7 +1153,7 @@ impl Problem { if link.get_target() == package_name { return Some(format!( "{} {}d by {}", - link.get_pretty_constraint().unwrap_or(""), + link.get_pretty_constraint(), substr(link.get_description(), 0, Some(-1)), selected.get_pretty_string() )); diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs index 3d7bb2d..7804b99 100644 --- a/crates/shirabe/src/dependency_resolver/rule.rs +++ b/crates/shirabe/src/dependency_resolver/rule.rs @@ -441,7 +441,7 @@ impl Rule { conflict_target = format!( "{} {}", package1.get_pretty_name(), - link.get_pretty_constraint().unwrap_or("") + link.get_pretty_constraint(), ); } @@ -453,16 +453,14 @@ impl Rule { for provide in package1.get_provides().values() { if provide.get_target() == link.get_target() { provide_type = Some("provides"); - provided = - Some(provide.get_pretty_constraint().unwrap_or("").to_string()); + provided = Some(provide.get_pretty_constraint().to_string()); break; } } for replace in package1.get_replaces().values() { if replace.get_target() == link.get_target() { provide_type = Some("replaces"); - provided = - Some(replace.get_pretty_constraint().unwrap_or("").to_string()); + provided = Some(replace.get_pretty_constraint().to_string()); break; } } @@ -470,7 +468,7 @@ impl Rule { conflict_target = format!( "{} {} ({} {} {} {})", link.get_target(), - link.get_pretty_constraint().unwrap_or(""), + link.get_pretty_constraint(), package1.get_pretty_string(), pt, link.get_target(), |