update toolchain to nightly-2021-03-22

2024-08-30 18:12:32 +00:00 · 2021-03-12 12:10:42 +01:00 · 2021-03-12 12:10:42 +01:00 · 6b23101fac
commit 6b23101fac
parent 759c423595
39 changed files with 146 additions and 158 deletions
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@ -13,6 +13,6 @@ reorder_impl_items = true
 fn_single_line = true
 inline_attribute_width = 50
 match_block_trailing_comma = true
-merge_imports = true
+imports_granularity="Crate"
 overflow_delimited_expr = true
 use_field_init_shorthand = true
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "ab_glyph"
 version = "0.2.10"
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@ -1,6 +1,6 @@
 #![deny(unsafe_code)]
 #![deny(clippy::clone_on_ref_ptr)]
-#![feature(label_break_value, option_zip, str_split_once)]
+#![feature(label_break_value, option_zip)]

 pub mod addr;
 pub mod cmd;
@ -1045,7 +1045,7 @@ impl Client {
    where
        C: Clone,
    {
-        Some(self.state.read_storage::<C>().get(self.entity()).cloned()?)
+        self.state.read_storage::<C>().get(self.entity()).cloned()
    }

    pub fn current_biome(&self) -> BiomeKind {
--- a/common/net/src/msg/client.rs
+++ b/common/net/src/msg/client.rs
@ -133,18 +133,18 @@ impl ClientMsg {
 end of 2nd level Enums
 */

-impl Into<ClientMsg> for ClientType {
-    fn into(self) -> ClientMsg { ClientMsg::Type(self) }
+impl From<ClientType> for ClientMsg {
+    fn from(other: ClientType) -> ClientMsg { ClientMsg::Type(other) }
 }

-impl Into<ClientMsg> for ClientRegister {
-    fn into(self) -> ClientMsg { ClientMsg::Register(self) }
+impl From<ClientRegister> for ClientMsg {
+    fn from(other: ClientRegister) -> ClientMsg { ClientMsg::Register(other) }
 }

-impl Into<ClientMsg> for ClientGeneral {
-    fn into(self) -> ClientMsg { ClientMsg::General(self) }
+impl From<ClientGeneral> for ClientMsg {
+    fn from(other: ClientGeneral) -> ClientMsg { ClientMsg::General(other) }
 }

-impl Into<ClientMsg> for PingMsg {
-    fn into(self) -> ClientMsg { ClientMsg::Ping(self) }
+impl From<PingMsg> for ClientMsg {
+    fn from(other: PingMsg) -> ClientMsg { ClientMsg::Ping(other) }
 }
--- a/common/net/src/msg/server.rs
+++ b/common/net/src/msg/server.rs
@ -268,22 +268,22 @@ impl From<comp::ChatMsg> for ServerGeneral {
    fn from(v: comp::ChatMsg) -> Self { ServerGeneral::ChatMsg(v) }
 }

-impl Into<ServerMsg> for ServerInfo {
-    fn into(self) -> ServerMsg { ServerMsg::Info(self) }
+impl From<ServerInfo> for ServerMsg {
+    fn from(o: ServerInfo) -> ServerMsg { ServerMsg::Info(o) }
 }

-impl Into<ServerMsg> for ServerInit {
-    fn into(self) -> ServerMsg { ServerMsg::Init(Box::new(self)) }
+impl From<ServerInit> for ServerMsg {
+    fn from(o: ServerInit) -> ServerMsg { ServerMsg::Init(Box::new(o)) }
 }

-impl Into<ServerMsg> for ServerRegisterAnswer {
-    fn into(self) -> ServerMsg { ServerMsg::RegisterAnswer(self) }
+impl From<ServerRegisterAnswer> for ServerMsg {
+    fn from(o: ServerRegisterAnswer) -> ServerMsg { ServerMsg::RegisterAnswer(o) }
 }

-impl Into<ServerMsg> for ServerGeneral {
-    fn into(self) -> ServerMsg { ServerMsg::General(self) }
+impl From<ServerGeneral> for ServerMsg {
+    fn from(o: ServerGeneral) -> ServerMsg { ServerMsg::General(o) }
 }

-impl Into<ServerMsg> for PingMsg {
-    fn into(self) -> ServerMsg { ServerMsg::Ping(self) }
+impl From<PingMsg> for ServerMsg {
+    fn from(o: PingMsg) -> ServerMsg { ServerMsg::Ping(o) }
 }
--- a/common/src/assets.rs
+++ b/common/src/assets.rs
@ -211,8 +211,7 @@ lazy_static! {
 pub fn path_of(specifier: &str, ext: &str) -> PathBuf { ASSETS.source().path_of(specifier, ext) }

 fn get_dir_files(files: &mut Vec<String>, path: &Path, specifier: &str) -> io::Result<()> {
-    for entry in fs::read_dir(path)? {
-        if let Ok(entry) = entry {
+    for entry in (fs::read_dir(path)?).flatten() {
        let path = entry.path();
        let maybe_stem = path.file_stem().and_then(|stem| stem.to_str());

@ -226,7 +225,6 @@ fn get_dir_files(files: &mut Vec<String>, path: &Path, specifier: &str) -> io::R
            }
        }
    }
-    }

    Ok(())
 }
--- a/common/src/comp/chat.rs
+++ b/common/src/comp/chat.rs
@ -289,8 +289,8 @@ impl SpeechBubble {
        let timeout = Instant::now() + Duration::from_secs_f64(SpeechBubble::DEFAULT_DURATION);
        Self {
            message,
-            timeout,
            icon,
+            timeout,
        }
    }

@ -299,8 +299,8 @@ impl SpeechBubble {
        let timeout = Instant::now() + Duration::from_secs_f64(SpeechBubble::DEFAULT_DURATION);
        Self {
            message,
-            timeout,
            icon,
+            timeout,
        }
    }

--- a/common/src/comp/inventory/item/modular.rs
+++ b/common/src/comp/inventory/item/modular.rs
@ -261,7 +261,7 @@ fn make_tagexample_def(
        modkind.identifier_name(),
        toolkind.identifier_name(),
    );
-    let tag = ModularComponentTag { modkind, toolkind };
+    let tag = ModularComponentTag { toolkind, modkind };
    // TODO: i18n
    let name = format!("Any {}", tag.name());
    let description = format!(
@ -293,7 +293,7 @@ fn initialize_modular_assets() -> (HashMap<String, RawItemDef>, RawRecipeBook) {
        for &modkind in &MODKINDS {
            for tier in 0..=5 {
                let (identifier, item) = make_component_def(toolkind, modkind, tier);
-                let tag = ModularComponentTag { modkind, toolkind };
+                let tag = ModularComponentTag { toolkind, modkind };
                exemplars
                    .entry(tag)
                    .or_insert_with(Vec::new)
--- a/common/src/comp/ori.rs
+++ b/common/src/comp/ori.rs
@ -285,8 +285,9 @@ impl From<SerdeOri> for Ori {
        }
    }
 }
-impl Into<SerdeOri> for Ori {
-    fn into(self) -> SerdeOri { SerdeOri(self.to_quat()) }
+
+impl From<Ori> for SerdeOri {
+    fn from(other: Ori) -> SerdeOri { SerdeOri(other.to_quat()) }
 }

 impl Component for Ori {
--- a/common/src/comp/stats.rs
+++ b/common/src/comp/stats.rs
@ -5,6 +5,7 @@ use specs_idvs::IdvStorage;
 use std::{error::Error, fmt};

 #[derive(Debug)]
+#[allow(dead_code)] // TODO: remove once trade sim hits master
 pub enum StatChangeError {
    Underflow,
    Overflow,
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@ -7,7 +7,6 @@
    arbitrary_enum_discriminant,
    associated_type_defaults,
    bool_to_option,
-    const_checked_int_methods,
    const_generics,
    fundamental,
    iter_map_while,
--- a/common/src/recipe.rs
+++ b/common/src/recipe.rs
@ -140,7 +140,7 @@ impl assets::Compound for RecipeBook {
                    .map(load_recipe_input)
                    .collect::<Result<_, _>>()?;
                let output = load_item_def(output)?;
-                Ok((name.clone(), Recipe { inputs, output }))
+                Ok((name.clone(), Recipe { output, inputs }))
            })
            .collect::<Result<_, assets::Error>>()?;

--- a/common/src/region.rs
+++ b/common/src/region.rs
@ -235,15 +235,13 @@ impl RegionMap {
                return Some(key);
            } else {
                // Check neighbors
-                for o in region.neighbors.iter() {
-                    if let Some(idx) = o {
+                for idx in region.neighbors.iter().flatten() {
                    let (key, region) = self.regions.get_index(*idx).unwrap();
                    if region.entities().contains(id) {
                        return Some(*key);
                    }
                }
            }
-            }
        } else {
            // Check neighbors
            for o in &NEIGHBOR_OFFSETS {
--- a/common/src/typed.rs
+++ b/common/src/typed.rs
@ -45,16 +45,16 @@ pub trait SynthTyped<Context, Target> {
 /// variable, but this way we don't have to implement variable lookup and it
 /// doesn't serialize with variables).
 #[fundamental]
-#[serde(transparent)]
 #[derive(Deserialize, Serialize)]
+#[serde(transparent)]
 pub struct WeakHead<Reduction, Type> {
    pub red: Reduction,
    #[serde(skip)]
    pub ty: PhantomData<Type>,
 }

-#[serde(transparent)]
 #[derive(Deserialize, Serialize)]
+#[serde(transparent)]
 pub struct Pure<T>(pub T);

 impl<'a, Context: SubContext<S>, T, S> Typed<Context, &'a T, S> for &'a Pure<T> {
@ -190,15 +190,15 @@ impl<Context, Target> SynthTyped<Context, Target> for WeakHead<Pure<Target>, Tar
 /// lift at some point; struct variants are not yet supported, and neither
 /// attributes on fields.
 #[fundamental]
-#[serde(transparent)]
 #[derive(Deserialize, Serialize)]
+#[serde(transparent)]
 pub struct ElimCase<Cases> {
    pub cases: Cases,
 }

 #[fundamental]
-#[serde(transparent)]
 #[derive(Deserialize, Serialize)]
+#[serde(transparent)]
 pub struct ElimProj<Proj> {
    pub proj: Proj,
 }
--- a/common/src/uid.rs
+++ b/common/src/uid.rs
@ -12,8 +12,8 @@ use std::{fmt, u64};
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Uid(pub u64);

-impl Into<u64> for Uid {
-    fn into(self) -> u64 { self.0 }
+impl From<Uid> for u64 {
+    fn from(uid: Uid) -> u64 { uid.0 }
 }

 impl From<u64> for Uid {
--- a/common/src/util/dir.rs
+++ b/common/src/util/dir.rs
@ -37,8 +37,9 @@ impl From<SerdeDir> for Dir {
        }
    }
 }
-impl Into<SerdeDir> for Dir {
-    fn into(self) -> SerdeDir { SerdeDir(*self) }
+
+impl From<Dir> for SerdeDir {
+    fn from(other: Dir) -> SerdeDir { SerdeDir(*other) }
 }
 /*pub enum TryFromVec3Error {
    ContainsNans,
--- a/common/src/volumes/vol_grid_2d.rs
+++ b/common/src/volumes/vol_grid_2d.rs
@ -124,10 +124,7 @@ impl<V: RectRasterableVol> VolGrid2d<V> {
    }

    pub fn get_key(&self, key: Vec2<i32>) -> Option<&V> {
-        match self.chunks.get(&key) {
-            Some(arc_chunk) => Some(arc_chunk.as_ref()),
-            None => None,
-        }
+        self.chunks.get(&key).map(|arc_chunk| arc_chunk.as_ref())
    }

    pub fn get_key_arc(&self, key: Vec2<i32>) -> Option<&Arc<V>> { self.chunks.get(&key) }
--- a/common/src/volumes/vol_grid_3d.rs
+++ b/common/src/volumes/vol_grid_3d.rs
@ -123,10 +123,7 @@ impl<V: RasterableVol> VolGrid3d<V> {
    }

    pub fn get_key(&self, key: Vec3<i32>) -> Option<&V> {
-        match self.chunks.get(&key) {
-            Some(arc_chunk) => Some(arc_chunk.as_ref()),
-            None => None,
-        }
+        self.chunks.get(&key).map(|arc_chunk| arc_chunk.as_ref())
    }

    pub fn get_key_arc(&self, key: Vec3<i32>) -> Option<&Arc<V>> { self.chunks.get(&key) }
--- a/network/src/api.rs
+++ b/network/src/api.rs
@ -1050,7 +1050,7 @@ where
                    f(data);
                    break;
                },
-                Err(TryRecvError::Closed) => panic!(CHANNEL_ERR),
+                Err(TryRecvError::Closed) => panic!("{}", CHANNEL_ERR),
                Err(TryRecvError::Empty) => {
                    trace!("activly sleeping");
                    cnt += 1;
--- a/2
+++ b/2
@ -1 +1 @@
-nightly-2021-01-01
+nightly-2021-03-22
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@ -6,8 +6,7 @@
    bool_to_option,
    drain_filter,
    option_unwrap_none,
-    option_zip,
-    str_split_once
+    option_zip
 )]
 #![cfg_attr(not(feature = "worldgen"), feature(const_panic))]

--- a/server/src/metrics.rs
+++ b/server/src/metrics.rs
@ -125,18 +125,18 @@ impl EcsSystemMetrics {
            &["system"],
        )?;

-        registry.register(Box::new(system_length_hist.clone()))?;
-        registry.register(Box::new(system_length_count.clone()))?;
        registry.register(Box::new(system_start_time.clone()))?;
        registry.register(Box::new(system_length_time.clone()))?;
        registry.register(Box::new(system_thread_avg.clone()))?;
+        registry.register(Box::new(system_length_hist.clone()))?;
+        registry.register(Box::new(system_length_count.clone()))?;

        Ok(Self {
-            system_length_hist,
-            system_length_count,
            system_start_time,
            system_length_time,
            system_thread_avg,
+            system_length_hist,
+            system_length_count,
        })
    }
 }
--- a/server/src/persistence/character_loader.rs
+++ b/server/src/persistence/character_loader.rs
@ -162,8 +162,8 @@ impl CharacterLoader {
            .unwrap();

        Ok(Self {
-            update_tx,
            update_rx,
+            update_tx,
        })
    }

--- a/server/src/persistence/models.rs
+++ b/server/src/persistence/models.rs
@ -18,8 +18,8 @@ pub struct NewCharacter<'a> {
 }

 #[derive(Identifiable, Queryable, Debug)]
-#[primary_key(character_id)]
 #[table_name = "character"]
+#[primary_key(character_id)]
 pub struct Character {
    pub character_id: i64,
    pub player_uuid: String,
@ -27,9 +27,9 @@ pub struct Character {
    pub waypoint: Option<String>,
 }

-#[primary_key(item_id)]
-#[table_name = "item"]
 #[derive(Debug, Insertable, Queryable, AsChangeset)]
+#[table_name = "item"]
+#[primary_key(item_id)]
 pub struct Item {
    pub item_id: i64,
    pub parent_container_item_id: i64,
--- a/voxygen/src/audio/channel.rs
+++ b/voxygen/src/audio/channel.rs
@ -171,12 +171,12 @@ impl AmbientChannel {
    pub fn new(stream: &OutputStreamHandle, tag: AmbientChannelTag) -> Self {
        let new_sink = Sink::try_new(stream);
        match new_sink {
-            Ok(sink) => Self { sink, tag },
+            Ok(sink) => Self { tag, sink },
            Err(_) => {
                warn!("Failed to create rodio sink. May not play wind sounds.");
                Self {
-                    sink: Sink::new_idle().0,
                    tag,
+                    sink: Sink::new_idle().0,
                }
            },
        }
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@ -735,7 +735,7 @@ pub struct Hud {
    force_chat_cursor: Option<Index>,
    tab_complete: Option<String>,
    pulse: f32,
-    velocity: f32,
+    _velocity: f32,
    slot_manager: slots::SlotManager,
    hotbar: hotbar::State,
    events: Vec<Event>,
@ -844,7 +844,7 @@ impl Hud {
            force_chat_cursor: None,
            tab_complete: None,
            pulse: 0.0,
-            velocity: 0.0,
+            _velocity: 0.0,
            slot_manager,
            hotbar: hotbar_state,
            events: Vec::new(),
@ -1791,7 +1791,7 @@ impl Hud {

        // Display debug window.
        if let Some(debug_info) = debug_info {
-            self.velocity = match debug_info.velocity {
+            self._velocity = match debug_info.velocity {
                Some(velocity) => velocity.0.magnitude(),
                None => 0.0,
            };
--- a/voxygen/src/i18n.rs
+++ b/voxygen/src/i18n.rs
@ -259,8 +259,7 @@ impl assets::Compound for LocalizationList {
        let mut languages = vec![];

        let i18n_root = assets::path_of(specifier, "");
-        for i18n_directory in std::fs::read_dir(&i18n_root)? {
-            if let Ok(i18n_entry) = i18n_directory {
+        for i18n_entry in (std::fs::read_dir(&i18n_root)?).flatten() {
            if let Some(i18n_key) = i18n_entry.file_name().to_str() {
                // load the root file of all the subdirectories
                if let Ok(localization) = cache.load::<RawLocalization>(
@ -270,7 +269,6 @@ impl assets::Compound for LocalizationList {
                }
            }
        }
-        }

        Ok(LocalizationList(languages))
    }
@ -418,7 +416,7 @@ mod tests {
                                {
                                    Ok(true) => Some(e.final_commit_id()),
                                    Ok(false) => Some(existing_commit),
-                                    Err(err) => panic!(err),
+                                    Err(err) => panic!("{}", err),
                                }
                            },
                            None => Some(e.final_commit_id()),
@ -439,8 +437,8 @@ mod tests {
        let root_dir = std::env::current_dir()
            .map(|p| p.parent().expect("").to_owned())
            .unwrap();
-        for i18n_file in root_dir.join(&dir).read_dir().unwrap() {
-            if let Ok(i18n_file) = i18n_file {
+        //TODO: review unwraps in this file
+        for i18n_file in root_dir.join(&dir).read_dir().unwrap().flatten() {
            if let Ok(file_type) = i18n_file.file_type() {
                if file_type.is_file() {
                    let full_path = i18n_file.path();
@ -458,9 +456,7 @@ mod tests {
                            continue;
                        },
                    };
-                        i18n_key_versions
-                            .extend(generate_key_version(&repo, &i18n, &path, &i18n_blob));
-                    }
+                    i18n_key_versions.extend(generate_key_version(&repo, &i18n, &path, &i18n_blob));
                }
            }
        }
@ -471,8 +467,7 @@ mod tests {
            .map(|p| p.parent().expect("").to_owned())
            .unwrap();
        // Walk through each file in the directory
-        for i18n_file in root_dir.join(&directory_path).read_dir().unwrap() {
-            if let Ok(i18n_file) = i18n_file {
+        for i18n_file in root_dir.join(&directory_path).read_dir().unwrap().flatten() {
            if let Ok(file_type) = i18n_file.file_type() {
                // Skip folders and the manifest file (which does not contain the same struct we
                // want to load)
@ -497,7 +492,6 @@ mod tests {
            }
        }
    }
-    }

    // Test to verify all languages that they are VALID and loadable, without
    // need of git just on the local assets folder
--- a/voxygen/src/render/pipelines/particle.rs
+++ b/voxygen/src/render/pipelines/particle.rs
@ -77,7 +77,7 @@ gfx_defines! {
 }

 impl Vertex {
-    #[allow(clippy::collapsible_if)]
+    #[allow(clippy::collapsible_else_if)]
    pub fn new(pos: Vec3<f32>, norm: Vec3<f32>) -> Self {
        let norm_bits = if norm.x != 0.0 {
            if norm.x < 0.0 { 0 } else { 1 }
--- a/voxygen/src/render/pipelines/sprite.rs
+++ b/voxygen/src/render/pipelines/sprite.rs
@ -87,7 +87,7 @@ impl fmt::Display for Vertex {

 impl Vertex {
    // NOTE: Limit to 16 (x) × 16 (y) × 32 (z).
-    #[allow(clippy::collapsible_if)]
+    #[allow(clippy::collapsible_else_if)]
    pub fn new(
        atlas_pos: Vec2<u16>,
        pos: Vec3<f32>,
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@ -272,6 +272,7 @@ pub struct Renderer {
    lod_terrain_pipeline: GfxPipeline<lod_terrain::pipe::Init<'static>>,
    clouds_pipeline: GfxPipeline<clouds::pipe::Init<'static>>,
    postprocess_pipeline: GfxPipeline<postprocess::pipe::Init<'static>>,
+    #[allow(dead_code)] //TODO: remove ?
    player_shadow_pipeline: GfxPipeline<figure::pipe::Init<'static>>,

    shaders: AssetHandle<Shaders>,
@ -358,16 +359,16 @@ impl Renderer {
                directed_sampler,
            ) = shadow_views;
            Some(ShadowMapRenderer {
+                directed_depth_stencil_view,
+                directed_res,
+                directed_sampler,
+
                // point_encoder: factory.create_command_buffer().into(),
                // directed_encoder: factory.create_command_buffer().into(),
                point_depth_stencil_view,
                point_res,
                point_sampler,

-                directed_depth_stencil_view,
-                directed_res,
-                directed_sampler,
-
                point_pipeline,
                terrain_directed_pipeline,
                figure_directed_pipeline,
--- a/voxygen/src/scene/terrain/watcher.rs
+++ b/voxygen/src/scene/terrain/watcher.rs
@ -129,14 +129,14 @@ impl BlocksOfInterest {
            reeds,
            fireflies,
            flowers,
-            interactables,
-            lights,
            fire_bowls,
            snow,
            cricket1,
            cricket2,
            cricket3,
            frogs,
+            interactables,
+            lights,
        }
    }
 }
--- a/voxygen/src/ui/ice/mod.rs
+++ b/voxygen/src/ui/ice/mod.rs
@ -184,6 +184,7 @@ impl IcedUi {
        let messages = {
            span!(_guard, "update user_interface");
            let mut messages = Vec::new();
+            #[allow(clippy::manual_map)]
            let _event_status_list = user_interface.update(
                &self.events,
                cursor_position,
--- a/voxygen/src/ui/ice/widget/mouse_detector.rs
+++ b/voxygen/src/ui/ice/widget/mouse_detector.rs
@ -22,9 +22,9 @@ pub struct MouseDetector<'a> {
 impl<'a> MouseDetector<'a> {
    pub fn new(state: &'a mut State, width: Length, height: Length) -> Self {
        Self {
-            state,
            width,
            height,
+            state,
        }
    }
 }
--- a/voxygen/src/ui/widgets/image_slider.rs
+++ b/voxygen/src/ui/widgets/image_slider.rs
@ -45,7 +45,9 @@ pub struct ImageSlider<T, K> {
 struct Track {
    image_id: image::Id,
    color: Option<Color>,
+    #[allow(dead_code)]
    src_rect: Option<Rect>,
+    #[allow(dead_code)]
    breadth: Option<f32>,
    // Padding on the ends of the track constraining the slider to a smaller area.
    padding: (f32, f32),
@ -56,6 +58,7 @@ struct Slider {
    hover_image_id: Option<image::Id>,
    press_image_id: Option<image::Id>,
    color: Option<Color>,
+    #[allow(dead_code)]
    src_rect: Option<Rect>,
    length: Option<f32>,
 }
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@ -1391,13 +1391,9 @@ impl Window {
                *remapping = None;
                None
            },
-            None => {
-                if let Some(game_inputs) = controls.get_associated_game_inputs(&key_mouse) {
-                    Some(game_inputs.iter())
-                } else {
-                    None
-                }
-            },
+            None => controls
+                .get_associated_game_inputs(&key_mouse)
+                .map(|game_inputs| game_inputs.iter()),
        }
    }

--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@ -13,7 +13,6 @@
    const_panic,
    label_break_value,
    or_patterns,
-    array_value_iter,
    array_map
 )]

--- a/world/src/sim/mod.rs
+++ b/world/src/sim/mod.rs
@ -358,7 +358,8 @@ pub struct WorldSim {
    /// post-erosion warping, cliffs, and other things like that).
    pub max_height: f32,
    pub(crate) chunks: Vec<SimChunk>,
-    pub(crate) locations: Vec<Location>,
+    //TODO: remove or use this property
+    pub(crate) _locations: Vec<Location>,

    pub(crate) gen_ctx: GenCtx,
    pub rng: ChaChaRng,
@ -1397,7 +1398,7 @@ impl WorldSim {
            map_size_lg,
            max_height: maxh as f32,
            chunks,
-            locations: Vec::new(),
+            _locations: Vec::new(),
            gen_ctx,
            rng,
        };
@ -1718,7 +1719,7 @@ impl WorldSim {
        }

        self.rng = rng;
-        self.locations = locations;
+        self._locations = locations;
    }

    pub fn get(&self, chunk_pos: Vec2<i32>) -> Option<&SimChunk> {
--- a/world/src/site/dungeon/mod.rs
+++ b/world/src/site/dungeon/mod.rs
@ -1170,7 +1170,7 @@ impl Floor {
    }

    // Find orientation of a position relative to another position
-    #[allow(clippy::collapsible_if)]
+    #[allow(clippy::collapsible_else_if)]
    fn relative_ori(pos1: Vec2<i32>, pos2: Vec2<i32>) -> u8 {
        if (pos1.x - pos2.x).abs() < (pos1.y - pos2.y).abs() {
            if pos1.y > pos2.y { 4 } else { 8 }
--- a/world/src/site2/mod.rs
+++ b/world/src/site2/mod.rs
@ -740,10 +740,10 @@ fn wpos_is_hazard(land: &Land, wpos: Vec2<i32>) -> Option<HazardKind> {
        .map_or(true, |c| c.river.near_water())
    {
        Some(HazardKind::Water)
-    } else if let Some(gradient) = Some(land.get_gradient_approx(wpos)).filter(|g| *g > 0.8) {
-        Some(HazardKind::Hill { gradient })
    } else {
-        None
+        Some(land.get_gradient_approx(wpos))
+            .filter(|g| *g > 0.8)
+            .map(|gradient| HazardKind::Hill { gradient })
    }
 }