From 01e9c7d450eb676b1ecd257f8de378ef410d76fd Mon Sep 17 00:00:00 2001 From: Joey Payne <jyapayne@gmail.com> Date: Fri, 24 Apr 2015 11:25:00 -0600 Subject: Removed explicit imports in compiler/nimfix/*.nim and added cfg path modification --- compiler/nimfix/nimfix.nim | 5 ++--- compiler/nimfix/nimfix.nim.cfg | 2 +- compiler/nimfix/pretty.nim | 6 ++---- compiler/nimfix/prettybase.nim | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'compiler') diff --git a/compiler/nimfix/nimfix.nim b/compiler/nimfix/nimfix.nim index 0c5e2a88b..7b42537c4 100644 --- a/compiler/nimfix/nimfix.nim +++ b/compiler/nimfix/nimfix.nim @@ -10,9 +10,8 @@ ## Nimfix is a tool that helps to convert old-style Nimrod code to Nim code. import strutils, os, parseopt -import compiler/options, compiler/commands, compiler/modules, compiler/sem, - compiler/passes, compiler/passaux, pretty, compiler/msgs, - compiler/nimconf, compiler/extccomp, compiler/condsyms, compiler/lists +import options, commands, modules, sem, passes, passaux, pretty, msgs, nimconf, + extccomp, condsyms, lists const Usage = """ Nimfix - Tool to patch Nim code diff --git a/compiler/nimfix/nimfix.nim.cfg b/compiler/nimfix/nimfix.nim.cfg index 31a41e080..47b4a3713 100644 --- a/compiler/nimfix/nimfix.nim.cfg +++ b/compiler/nimfix/nimfix.nim.cfg @@ -5,7 +5,7 @@ hint[XDeclaredButNotUsed]:off path:"$projectPath/../.." path:"$lib/packages/docutils" -path:"$nim/compiler" +path:"../compiler" define:useStdoutAsStdmsg symbol:nimfix diff --git a/compiler/nimfix/pretty.nim b/compiler/nimfix/pretty.nim index 081a1d372..acac574af 100644 --- a/compiler/nimfix/pretty.nim +++ b/compiler/nimfix/pretty.nim @@ -11,10 +11,8 @@ ## to convert Nim code into a consistent style. import - strutils, os, intsets, strtabs, ropes, - compiler/options, compiler/ast, compiler/astalgo, - compiler/msgs, compiler/idents, compiler/semdata, - prettybase + strutils, os, options, ast, astalgo, msgs, ropes, idents, + intsets, strtabs, semdata, prettybase type StyleCheck* {.pure.} = enum None, Warn, Auto diff --git a/compiler/nimfix/prettybase.nim b/compiler/nimfix/prettybase.nim index 839c1ff8f..225b78479 100644 --- a/compiler/nimfix/prettybase.nim +++ b/compiler/nimfix/prettybase.nim @@ -7,8 +7,7 @@ # distribution, for details about the copyright. # -import strutils, lexbase, streams, compiler/ast, compiler/msgs, - compiler/idents +import ast, msgs, strutils, idents, lexbase, streams from os import splitFile type -- cgit 1.4.1-2-gfad0