Skip to content

Commit f54267a

Browse files
committed
Use num::cast where appropriate...
...rather than checked_cast.
1 parent 12fb4bd commit f54267a

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

include/flux/core/default_impls.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ struct sequence_traits<R> : default_sequence_traits {
222222

223223
static constexpr auto size(auto& self) -> distance_t
224224
{
225-
return num::checked_cast<distance_t>(std::ranges::ssize(self));
225+
return num::cast<distance_t>(std::ranges::ssize(self));
226226
}
227227

228228
static constexpr auto data(auto& self) -> auto*
@@ -242,7 +242,7 @@ struct sequence_traits<R> : default_sequence_traits {
242242
++iter;
243243
}
244244

245-
return num::checked_cast<index_t>(iter - std::ranges::begin(self));
245+
return num::cast<index_t>(iter - std::ranges::begin(self));
246246
}
247247
};
248248

include/flux/core/sequence_access.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ struct usize_fn {
127127
[[nodiscard]]
128128
constexpr auto operator()(Seq&& seq) const -> std::size_t
129129
{
130-
return num::checked_cast<std::size_t>(size_fn{}(seq));
130+
return num::unchecked_cast<std::size_t>(size_fn{}(seq));
131131
}
132132
};
133133

include/flux/op/cycle.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ struct cycle_adaptor : inline_sequence_base<cycle_adaptor<Base, IsInfinite>> {
186186
requires random_access_sequence<decltype(self.base_)> &&
187187
sized_sequence<decltype(self.base_)>
188188
{
189-
auto dist = num::checked_cast<distance_t>(to.n) - num::checked_cast<distance_t>(from.n);
189+
auto dist = num::cast<distance_t>(to.n) - num::cast<distance_t>(from.n);
190190
dist = num::mul(dist, flux::size(self.base_));
191191
return num::add(dist,
192192
flux::distance(self.base_, from.base_cur, to.base_cur));
@@ -204,7 +204,7 @@ struct cycle_adaptor : inline_sequence_base<cycle_adaptor<Base, IsInfinite>> {
204204
requires (!IsInfinite && sized_sequence<Base>)
205205
{
206206
return num::mul(flux::size(self.base_),
207-
num::checked_cast<flux::distance_t>(self.data_.count));
207+
num::cast<flux::distance_t>(self.data_.count));
208208
}
209209
};
210210
};

include/flux/op/slide.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct slide_fn {
115115
template <adaptable_sequence Seq>
116116
requires multipass_sequence<Seq>
117117
[[nodiscard]]
118-
constexpr auto operator()(Seq&& seq, std::integral auto win_sz) const
118+
constexpr auto operator()(Seq&& seq, num::integral auto win_sz) const
119119
-> sequence auto
120120
{
121121
return slide_adaptor<std::decay_t<Seq>>(FLUX_FWD(seq),
@@ -132,7 +132,7 @@ constexpr auto inline_sequence_base<D>::slide(std::integral auto win_sz) &&
132132
requires multipass_sequence<D>
133133
{
134134
FLUX_ASSERT(win_sz > 0);
135-
return flux::slide(std::move(derived()), num::checked_cast<distance_t>(win_sz));
135+
return flux::slide(std::move(derived()), win_sz);
136136
}
137137

138138
} // namespace slide

include/flux/source/iota.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,19 @@ struct iota_sequence_traits : default_sequence_traits {
9898
-> cursor_type&
9999
requires advancable<T>
100100
{
101-
return cur += num::checked_cast<std::iter_difference_t<T>>(offset);
101+
return cur += num::cast<std::iter_difference_t<T>>(offset);
102102
}
103103

104104
static constexpr auto distance(auto&, cursor_type const& from, cursor_type const& to)
105105
requires advancable<T>
106106
{
107-
return from <= to ? num::checked_cast<distance_t>(to - from) : -num::checked_cast<distance_t>(from - to);
107+
return from <= to ? num::cast<distance_t>(to - from) : -num::cast<distance_t>(from - to);
108108
}
109109

110110
static constexpr auto size(auto& self) -> distance_t
111111
requires advancable<T> && (Traits.has_start && Traits.has_end)
112112
{
113-
return num::checked_cast<distance_t>(self.end_ - self.start_);
113+
return num::cast<distance_t>(self.end_ - self.start_);
114114
}
115115
};
116116

include/flux/source/range.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ struct range_sequence : inline_sequence_base<range_sequence<R, IsConst>> {
122122
bounds_check(offset < distance(self, cur, last(self)));
123123
}
124124

125-
cur.iter += num::checked_cast<std::ranges::range_difference_t<V>>(offset);
125+
cur.iter += num::cast<std::ranges::range_difference_t<V>>(offset);
126126
}
127127

128128
template <typename Self>
@@ -131,7 +131,7 @@ struct range_sequence : inline_sequence_base<range_sequence<R, IsConst>> {
131131
-> distance_t
132132
requires std::ranges::random_access_range<R>
133133
{
134-
return num::checked_cast<distance_t>(std::ranges::distance(from.iter, to.iter));
134+
return num::cast<distance_t>(std::ranges::distance(from.iter, to.iter));
135135
}
136136

137137
template <typename Self>
@@ -159,7 +159,7 @@ struct range_sequence : inline_sequence_base<range_sequence<R, IsConst>> {
159159
static constexpr auto size(Self& self) -> distance_t
160160
requires std::ranges::sized_range<R>
161161
{
162-
return num::checked_cast<distance_t>(std::ranges::ssize(self.rng_));
162+
return num::cast<distance_t>(std::ranges::ssize(self.rng_));
163163
}
164164

165165
template <typename Self>

include/flux/source/repeat.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct repeat_sequence : inline_sequence_base<repeat_sequence<T, IsInfinite>>
7777

7878
static constexpr auto distance(self_t const&, std::size_t from, std::size_t to) -> distance_t
7979
{
80-
return num::checked_cast<distance_t>(to) - num::checked_cast<distance_t>(from);
80+
return num::cast<distance_t>(to) - num::cast<distance_t>(from);
8181
}
8282

8383
static constexpr auto for_each_while(self_t const& self, auto&& pred) -> std::size_t
@@ -110,7 +110,7 @@ struct repeat_sequence : inline_sequence_base<repeat_sequence<T, IsInfinite>>
110110
static constexpr auto size(self_t const& self) -> distance_t
111111
requires (!IsInfinite)
112112
{
113-
return num::checked_cast<distance_t>(self.data_.count);
113+
return num::cast<distance_t>(self.data_.count);
114114
}
115115
};
116116
};

0 commit comments

Comments
 (0)