refactor: remove unneeded brackets

Author: uncommon-nickname

include/rusty_iterators/chain.hpp

@@ -37,15 +37,13 @@ template <class T, class First, class Second>
 auto rusty_iterators::iterator::Chain<T, First, Second>::next() -> std::optional<T>
 {
     if (useSecond)
-    {
         return second.next();
-    }
+
     auto nextItem = first.next();
 
     if (nextItem.has_value())
-    {
         return std::move(nextItem);
-    }
+
     useSecond = true;
     return next();
 }
@@ -58,8 +56,7 @@ auto rusty_iterators::iterator::Chain<T, First, Second>::sizeHint() const -> std
     auto sizeSecond = second.sizeHint();
 
     if (!sizeFirst.has_value() || !sizeSecond.has_value())
-    {
         return std::nullopt;
-    }
+
     return sizeFirst.value() + sizeSecond.value();
 }

include/rusty_iterators/cycle.hpp

@@ -66,9 +66,8 @@ auto rusty_iterators::iterator::CopyCycle<T, Other>::sizeHint() const -> std::op
     auto size = it.sizeHint();
 
     if (size.has_value() && size.value() > 0)
-    {
         return std::nullopt;
-    }
+
     return 0;
 }
 
@@ -88,10 +87,9 @@ auto rusty_iterators::iterator::CacheCycle<T, Other>::next() -> std::optional<T>
     if (!nextItem.has_value())
     {
         if (cache.size() == 0)
-        {
             // If cycle is empty, we don't want to go into cached logic.
             return std::nullopt;
-        }
+
         useCache = true;
         return next();
     }
@@ -107,8 +105,7 @@ auto rusty_iterators::iterator::CacheCycle<T, Other>::sizeHint() const -> std::o
     auto size = it.sizeHint();
 
     if (size.has_value() && size.value() > 0)
-    {
         return std::nullopt;
-    }
+
     return 0;
 }

include/rusty_iterators/enumerate.hpp

@@ -37,9 +37,8 @@ auto rusty_iterators::iterator::Enumerate<T, Other>::next() -> std::optional<std
     auto nextItem = it.next();
 
     if (!nextItem.has_value())
-    {
         return std::nullopt;
-    }
+
     return std::tuple{idx++, std::move(nextItem.value())};
 }
 

include/rusty_iterators/file_iterator.hpp

@@ -29,24 +29,23 @@ class FileIterator<FIterType::Buffered>
     explicit FileIterator(const std::string& filePath, char delimiter = '\n')
     {
         std::ifstream is{filePath};
+
         if (!is.is_open())
-        {
             throw std::runtime_error{"Could not open the file."};
-        }
+
         std::string nextLine;
+
         while (std::getline(is, nextLine, delimiter))
-        {
             fileLines.push_back(std::move(nextLine));
-        }
+
         is.close();
     };
 
     auto next() -> std::optional<std::string>
     {
         [[unlikely]] if (ptr == fileLines.size())
-        {
             return std::nullopt;
-        }
+
         auto line = fileLines.at(ptr);
         ptr += 1;
         return std::move(line);
@@ -68,18 +67,16 @@ class FileIterator<FIterType::Lazy>
         : is(filePath), delimiter(delimiter)
     {
         if (!is.is_open())
-        {
             throw std::runtime_error{"Could not open the file."};
-        }
     };
 
     auto next() -> std::optional<std::string>
     {
         std::string nextLine;
+
         [[unlikely]] if (!std::getline(is, nextLine, delimiter))
-        {
             return std::nullopt;
-        }
+
         return std::move(nextLine);
     }
 

include/rusty_iterators/filter.hpp

@@ -36,9 +36,8 @@ auto rusty_iterators::iterator::Filter<T, Functor, Other>::next() -> std::option
     while (nextItem.has_value())
     {
         if (func(nextItem.value()))
-        {
             return std::move(nextItem);
-        }
+
         nextItem = it.next();
     }
     return std::nullopt;

include/rusty_iterators/filter_map.hpp

@@ -39,9 +39,8 @@ auto rusty_iterators::iterator::FilterMap<Tin, Tout, Functor, Other>::next() ->
         auto result = func(std::move(nextItem.value()));
 
         if (result.has_value())
-        {
             return std::move(result.value());
-        }
+
         nextItem = it.next();
     }
     return std::nullopt;

include/rusty_iterators/interface.hpp

@@ -423,9 +423,8 @@ auto rusty_iterators::interface::IterInterface<T, Derived>::position(Functor&& f
     [[likely]] while (nextItem.has_value())
     {
         if (func(nextItem.value()))
-        {
             return position;
-        }
+
         position += 1;
         nextItem = self().next();
     }
@@ -440,9 +439,8 @@ auto rusty_iterators::interface::IterInterface<T, Derived>::reduce(Functor&& f)
     auto first = self().next();
 
     [[unlikely]] if (!first.has_value())
-    {
         return std::nullopt;
-    }
+
     return fold(std::move(first.value()), std::forward<Functor>(f));
 }
 
@@ -482,9 +480,8 @@ auto rusty_iterators::interface::IterInterface<T, Derived>::tryFold(B&& init, Fu
         auto potentialAccum = func(std::move(accum), std::move(nextItem.value()));
 
         if (potentialAccum.has_value())
-        {
             return std::move(potentialAccum.value());
-        }
+
         accum    = potentialAccum.error();
         nextItem = self().next();
     }
@@ -559,9 +556,8 @@ auto rusty_iterators::interface::IterInterface<T, Derived>::sizeHintChecked() ->
     auto size = self().sizeHint();
 
     [[likely]] if (size.has_value())
-    {
         return size.value();
-    }
+
     throw std::length_error{
         "Trying to collect an infinite iterator will result in an infinite loop."};
 }

include/rusty_iterators/iterator.hpp

@@ -47,9 +47,7 @@ template <class Container>
 auto rusty_iterators::iterator::LazyIterator<Container>::next() -> std::optional<T>
 {
     [[unlikely]] if (ptr == end)
-    {
         return std::nullopt;
-    }
 
     auto& item = *ptr;
     ptr += 1;

include/rusty_iterators/map.hpp

@@ -44,9 +44,8 @@ auto rusty_iterators::iterator::Map<Tin, Functor, Other>::next() -> std::optiona
     auto item = it.next();
 
     [[likely]] if (item.has_value())
-    {
         return func(std::move(item.value()));
-    }
+
     return std::nullopt;
 }
 

include/rusty_iterators/moving_window.hpp

@@ -18,9 +18,7 @@ class MovingWindow : public IterInterface<std::vector<T>, MovingWindow<T, Other>
         : it(std::forward<Other>(it)), orig(this->it), size(size)
     {
         if (size == 0)
-        {
             throw std::length_error{"Moving window size must be greater that zero."};
-        }
     }
 
     auto next() -> std::optional<std::vector<T>>;
@@ -44,9 +42,8 @@ auto rusty_iterators::iterator::MovingWindow<T, Other>::next() -> std::optional<
         auto nextItem = it.next();
 
         [[unlikely]] if (!nextItem.has_value())
-        {
             return std::nullopt;
-        }
+
         result.push_back(std::move(nextItem.value()));
     }
 
@@ -64,8 +61,7 @@ auto rusty_iterators::iterator::MovingWindow<T, Other>::sizeHint() const -> std:
     auto size = it.sizeHint();
 
     if (!size.has_value())
-    {
         return std::nullopt;
-    }
+
     return size.value() == 0 ? size : size.value() - 1;
 }