From 1953c00f17bbb03cebd7cd2372bebd16e7be3b3b Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Sun, 6 Jul 2025 19:24:46 +1000 Subject: [PATCH] Misc renames --- Sources/apk/Index/ApkIndexPackage.swift | 8 +++++--- Sources/apk/Version/ApkVersionSpecification.swift | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Sources/apk/Index/ApkIndexPackage.swift b/Sources/apk/Index/ApkIndexPackage.swift index fa383d6..0e28277 100644 --- a/Sources/apk/Index/ApkIndexPackage.swift +++ b/Sources/apk/Index/ApkIndexPackage.swift @@ -165,10 +165,12 @@ extension ApkIndexPackage { } public extension ApkIndexPackage { + var nameDescription: String { + "\(self.name)-\(self.version) \(self.architecture ?? "")" + } + var shortDescription: String { - "\(self.name)-\(self.version) \(self.architecture ?? "")\n \\_ \(self.packageDescription)" - // ugrep/stable 3.11.2+dfsg-1 amd64 - // faster grep with an interactive query UI + "\(self.nameDescription)\n \\_ \(self.packageDescription)" } } diff --git a/Sources/apk/Version/ApkVersionSpecification.swift b/Sources/apk/Version/ApkVersionSpecification.swift index bac67cd..c750380 100644 --- a/Sources/apk/Version/ApkVersionSpecification.swift +++ b/Sources/apk/Version/ApkVersionSpecification.swift @@ -22,7 +22,7 @@ extension ApkVersionSpecification { } internal extension ApkVersionSpecification { - @inlinable var conflict: Bool { + @inlinable var isConflict: Bool { switch self { case .any(invert: true), .constraint(invert: true, _, _): return true