Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Rust 2021 postfix .into_iter()

Browse Source
This commit is contained in:
Olexorus 2022-03-15 16:34:56 +01:00
parent 998b1deb15
commit cf66eccb75
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/systems/src/phys.rs
View File

@ -1972,13 +1972,13 @@ fn closest_points(n: LineSegment2<f32>, m: LineSegment2<f32>) -> (Vec2<f32>, Vec
// Check to see whether the lines are parallel
if !t.is_finite() || !u.is_finite() {
// TODO: can use postfix .into_iter() when switching to Rust 2021
IntoIterator::into_iter([
[
(n.projected_point(m.start), m.start),
(n.projected_point(m.end), m.end),
(n.start, m.projected_point(n.start)),
(n.end, m.projected_point(n.end)),
])
]
.into_iter()
.min_by_key(|(a, b)| ordered_float::OrderedFloat(a.distance_squared(*b)))
.expect("Lines had non-finite elements")
} else {

27
world/src/sim/mod.rs
View File

@ -2130,18 +2130,21 @@ impl WorldSim {
/// them spawning).
pub fn get_near_trees(&self, wpos: Vec2<i32>) -> impl Iterator<Item = TreeAttr> + '_ {
// Deterministic based on wpos
// TODO: can use postfix .into_iter() when switching to Rust 2021
let normal_trees = IntoIterator::into_iter(self.gen_ctx.structure_gen.get(wpos))
.filter_map(move |(wpos, seed)| {
let lottery = self.make_forest_lottery(wpos);
Some(TreeAttr {
pos: wpos,
seed,
scale: 1.0,
forest_kind: *lottery.choose_seeded(seed).as_ref()?,
inhabited: false,
})
});
let normal_trees =
self.gen_ctx
.structure_gen
.get(wpos)
.into_iter()
.filter_map(move |(wpos, seed)| {
let lottery = self.make_forest_lottery(wpos);
Some(TreeAttr {
pos: wpos,
seed,
scale: 1.0,
forest_kind: *lottery.choose_seeded(seed).as_ref()?,
inhabited: false,
})
});
// // For testing
// let giant_trees =