Rename CondaURL::base > CondaURL::generic

mamba-org · Nov 23, 2023 · e73d239 · e73d239
1 parent e7bf342
commit e73d239
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libmamba/include/mamba/specs/conda_url.hpp b/libmamba/include/mamba/specs/conda_url.hpp
@@ -35,7 +35,7 @@ namespace mamba::specs
         explicit CondaURL(util::URL&& url);
         explicit CondaURL(const util::URL& url);
 
-        auto base() const -> const util::URL&;
+        [[nodiscard]] auto generic() const -> const util::URL&;
 
         using Base::scheme_is_defaulted;
         using Base::scheme;

diff --git a/libmamba/src/specs/conda_url.cpp b/libmamba/src/specs/conda_url.cpp
@@ -113,7 +113,7 @@ namespace mamba::specs
     {
     }
 
-    auto CondaURL::base() const -> const util::URL&
+    auto CondaURL::generic() const -> const util::URL&
     {
         return static_cast<const util::URL&>(*this);
     }
@@ -506,7 +506,7 @@ namespace mamba::specs
 
     auto operator==(const CondaURL& a, const CondaURL& b) -> bool
     {
-        return a.base() == b.base();
+        return a.generic() == b.generic();
     }
 
     auto operator!=(const CondaURL& a, const CondaURL& b) -> bool
@@ -529,5 +529,5 @@ namespace mamba::specs
 auto
 std::hash<mamba::specs::CondaURL>::operator()(const mamba::specs::CondaURL& u) const -> std::size_t
 {
-    return std::hash<mamba::util::URL>()(u.base());
+    return std::hash<mamba::util::URL>()(u.generic());
 }