diff --git a/src/tools/Cargo.toml b/src/tools/Cargo.toml index 6417c5aa..7d477f30 100644 --- a/src/tools/Cargo.toml +++ b/src/tools/Cargo.toml @@ -2,6 +2,7 @@ name = "dmm-tools" version = "0.1.0" authors = ["Tad Hardesty "] +edition = "2018" [lib] path = "lib.rs" diff --git a/src/tools/dmm.rs b/src/tools/dmm.rs index f932f8e7..508afcd7 100644 --- a/src/tools/dmm.rs +++ b/src/tools/dmm.rs @@ -9,7 +9,7 @@ use linked_hash_map::LinkedHashMap; use dm::{DMError, Location}; use dm::constants::Constant; -use dmi::Dir; +use crate::dmi::Dir; mod read; mod save_tgm; diff --git a/src/tools/lint.rs b/src/tools/lint.rs index 45bd0fcd..7fe3b11d 100644 --- a/src/tools/lint.rs +++ b/src/tools/lint.rs @@ -3,7 +3,7 @@ use std::fmt; use dm::objtree::*; use dm::constants::Constant; -use dmm::Map; +use crate::dmm::Map; macro_rules! lints { ($($ident:ident = $desc:expr;)*) => { diff --git a/src/tools/minimap.rs b/src/tools/minimap.rs index d15cd214..709773cb 100644 --- a/src/tools/minimap.rs +++ b/src/tools/minimap.rs @@ -5,10 +5,10 @@ use ndarray::Axis; use dm::objtree::*; use dm::constants::Constant; -use dmm::{Map, ZLevel, Prefab}; -use dmi::{Dir, Image}; -use render_passes::RenderPass; -use icon_cache::IconCache; +use crate::dmm::{Map, ZLevel, Prefab}; +use crate::dmi::{Dir, Image}; +use crate::render_passes::RenderPass; +use crate::icon_cache::IconCache; const TILE_SIZE: u32 = 32; diff --git a/src/tools/render_passes/icon_smoothing.rs b/src/tools/render_passes/icon_smoothing.rs index 26e343b9..c0d2b51a 100644 --- a/src/tools/render_passes/icon_smoothing.rs +++ b/src/tools/render_passes/icon_smoothing.rs @@ -2,8 +2,8 @@ use dm::objtree::ObjectTree; use dm::constants::Constant; -use dmi::Dir; -use minimap::{Sprite, Atom, GetVar, Neighborhood}; +use crate::dmi::Dir; +use crate::minimap::{Sprite, Atom, GetVar, Neighborhood}; use super::RenderPass; diff --git a/src/tools/render_passes/mod.rs b/src/tools/render_passes/mod.rs index 19fdef58..705ea40a 100644 --- a/src/tools/render_passes/mod.rs +++ b/src/tools/render_passes/mod.rs @@ -1,6 +1,6 @@ use dm::objtree::*; use dm::constants::Constant; -use minimap::{Atom, GetVar, Sprite, Layer, Neighborhood}; +use crate::minimap::{Atom, GetVar, Sprite, Layer, Neighborhood}; mod transit_tube; mod random; @@ -210,7 +210,7 @@ impl RenderPass for Overlays { objtree: &'a ObjectTree, _: &'a bumpalo::Bump, ) { - use dmi::Dir; + use crate::dmi::Dir; if atom.istype("/obj/machinery/power/apc/") { // auto-set pixel location diff --git a/src/tools/render_passes/smart_cables.rs b/src/tools/render_passes/smart_cables.rs index 8f30110b..b1ee0e9e 100644 --- a/src/tools/render_passes/smart_cables.rs +++ b/src/tools/render_passes/smart_cables.rs @@ -1,5 +1,5 @@ use std::fmt::Write; -use dmi::Dir; +use crate::dmi::Dir; use super::*; #[derive(Default)] diff --git a/src/tools/render_passes/transit_tube.rs b/src/tools/render_passes/transit_tube.rs index b32ecd28..b52a1950 100644 --- a/src/tools/render_passes/transit_tube.rs +++ b/src/tools/render_passes/transit_tube.rs @@ -1,5 +1,5 @@ use super::*; -use dmi::Dir; +use crate::dmi::Dir; #[derive(Default)] pub struct TransitTube; @@ -11,7 +11,7 @@ impl RenderPass for TransitTube { overlays: &mut Vec>, _: &bumpalo::Bump, ) { - use dmi::Dir::*; + use crate::dmi::Dir::*; if !atom.istype("/obj/structure/transit_tube/") { return;