Use llvm::map_range() instead of using mapped_iterator directly (#4997)

map_range() is a nice helper for constructing a pair of mapped_iterators.
carbon-language · Feb 21, 2025 · 210c26e · 210c26e
1 parent d843cc5
commit 210c26e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/toolchain/base/value_store.h b/toolchain/base/value_store.h
@@ -116,12 +116,7 @@ class ValueStore
       auto [index, value] = pair;
       return std::pair<IdT, ConstRefType>(IdT(index), value);
     };
-    auto range = llvm::enumerate(values_);
-    using Iter =
-        llvm::mapped_iterator<decltype(range.begin()), decltype(index_to_id)>;
-    auto begin = Iter(range.begin(), index_to_id);
-    auto end = Iter(range.end(), index_to_id);
-    return llvm::make_range(begin, end);
+    return llvm::map_range(llvm::enumerate(values_), index_to_id);
   }
 
  private:

diff --git a/toolchain/sem_ir/constant.h b/toolchain/sem_ir/constant.h
@@ -166,12 +166,7 @@ class ConstantValueStore {
       auto [index, value] = pair;
       return std::pair<InstId, ConstantId>(InstId(index), value);
     };
-    auto range = llvm::enumerate(values_);
-    using Iter =
-        llvm::mapped_iterator<decltype(range.begin()), decltype(index_to_id)>;
-    auto begin = Iter(range.begin(), index_to_id);
-    auto end = Iter(range.end(), index_to_id);
-    return llvm::make_range(begin, end);
+    return llvm::map_range(llvm::enumerate(values_), index_to_id);
   }
 
   // Returns the symbolic constants mapping as an ArrayRef whose keys are