From 294c975d49f5bd84f5867456b1a108eddfa3f450 Mon Sep 17 00:00:00 2001
From: Stefan Koch <stefan.koch@sociomantic.com>
Date: Tue, 20 Feb 2018 14:35:52 +0100
Subject: [PATCH] Fix Imports to point to the actual symbols rather then
wrongly imported ones.
---
src/dfmt/globmatch_editorconfig.d | 5 +++--
src/dfmt/main.d | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/dfmt/globmatch_editorconfig.d b/src/dfmt/globmatch_editorconfig.d
index ac1106f..898460f 100644
--- a/src/dfmt/globmatch_editorconfig.d
+++ b/src/dfmt/globmatch_editorconfig.d
@@ -2,8 +2,9 @@ module dfmt.globmatch_editorconfig;
import std.path : CaseSensitive;
import std.range : isForwardRange, ElementEncodingType;
-import std.string : isSomeChar, isSomeString, empty, save, front, popFront;
-import std.typecons : Unqual;
+import std.traits : isSomeChar, isSomeString;
+import std.range.primitives : empty, save, front, popFront;
+import std.traits : Unqual;
import std.conv : to;
import std.path : filenameCharCmp, isDirSeparator;
diff --git a/src/dfmt/main.d b/src/dfmt/main.d
index 7ed73b6..c59e3d8 100644
--- a/src/dfmt/main.d
+++ b/src/dfmt/main.d
@@ -188,7 +188,7 @@ else
Config explicitConfig;
if (explicitConfigDir)
{
- import std.path : exists, isDir;
+ import std.file : exists, isDir;
if (!exists(explicitConfigDir) || !isDir(explicitConfigDir))
{