Skip to content

Commit

Permalink
Use std imports
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnovak committed Dec 23, 2023
1 parent 259186a commit 9345c98
Show file tree
Hide file tree
Showing 23 changed files with 82 additions and 83 deletions.
6 changes: 3 additions & 3 deletions src/actions.nim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import options
import sets
import strformat
import std/options
import std/sets
import std/strformat

import koi/undomanager

Expand Down
6 changes: 3 additions & 3 deletions src/annotations.nim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import algorithm
import options
import tables
import std/algorithm
import std/options
import std/tables

import common
import rect
Expand Down
4 changes: 2 additions & 2 deletions src/bitable.nim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import options
import tables
import std/options
import std/tables


const DefaultInitialSize = 64
Expand Down
2 changes: 1 addition & 1 deletion src/cellgrid.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import options
import std/options

import common
import rect
Expand Down
2 changes: 1 addition & 1 deletion src/cfghelper.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import math
import std/math

import fieldlimits
import hocon
Expand Down
8 changes: 4 additions & 4 deletions src/cmdline.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import options
import parseopt
import strformat
import strutils
import std/options
import std/parseopt
import std/strformat
import std/strutils

import common
import hocon
Expand Down
8 changes: 4 additions & 4 deletions src/common.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sets
import strformat
import strutils
import tables
import std/sets
import std/strformat
import std/strutils
import std/tables

import koi
import nanovg
Expand Down
4 changes: 2 additions & 2 deletions src/csdwindow.nim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import lenientops
import logging
import std/lenientops
import std/logging

import glfw
import icons
Expand Down
10 changes: 5 additions & 5 deletions src/drawlevel.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import lenientops
import math
import options
import sequtils
import sets
import std/lenientops
import std/math
import std/options
import std/sequtils
import std/sets

import glad/gl
import koi
Expand Down
2 changes: 1 addition & 1 deletion src/fieldlimits.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import unicode
import std/unicode

type
FieldLimitsKind* = enum
Expand Down
16 changes: 8 additions & 8 deletions src/hocon.nim
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import deques
import math
import options
import unicode
import streams
import strformat
import strutils
import tables
import std/deques
import std/math
import std/options
import std/unicode
import std/streams
import std/strformat
import std/strutils
import std/tables

# {{{ UnicodeScanner

Expand Down
4 changes: 2 additions & 2 deletions src/level.nim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import math
import options
import std/math
import std/options

import annotations
import common
Expand Down
6 changes: 3 additions & 3 deletions src/links.nim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import options
import sets
import tables
import std/options
import std/sets
import std/tables

import common
import rect
Expand Down
31 changes: 15 additions & 16 deletions src/main.nim
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# {{{ Imports

import algorithm
import browsers
import lenientops
import logging
import macros
import math
import options
import os
import sequtils
import sets
import std/algorithm
import std/browsers
import std/lenientops
import std/logging
import std/macros
import std/math
import std/options
import std/os
import std/sequtils
import std/sets
import std/monotimes
import streams
import strformat
import strutils
import tables
import times
import std/streams
import std/strformat
import std/strutils
import std/tables
import std/times

import deps/with
import glad/gl
Expand Down Expand Up @@ -8037,7 +8037,6 @@ proc desc(s: string): QuickRefItem =
const QuickRefSepa = QuickRefItem(kind: qkSeparator)

# {{{ General
# TODO YUBN key support
let g_quickRef_General = @[
@[
scNewMap.sc, "New map".desc,
Expand Down
10 changes: 5 additions & 5 deletions src/map.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import algorithm
import options
import sequtils
import sets
import strformat
import std/algorithm
import std/options
import std/sequtils
import std/sets
import std/strformat

import common
import deps/with
Expand Down
2 changes: 1 addition & 1 deletion src/multitable.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import tables
import std/tables

const DefaultInitialSize = 64

Expand Down
16 changes: 8 additions & 8 deletions src/persistence.nim
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import algorithm
import math
import logging except Level
import options
import std/algorithm
import std/math
import std/logging except Level
import std/options
import std/enumutils
import strformat
import strutils
import sugar
import unicode
import std/strformat
import std/strutils
import std/sugar
import std/unicode

import riff

Expand Down
2 changes: 1 addition & 1 deletion src/rect.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import options
import std/options

type
RectType = SomeInteger | Natural
Expand Down
6 changes: 3 additions & 3 deletions src/regions.nim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import options
import strutils
import tables
import std/options
import std/strutils
import std/tables

import common
import utils
Expand Down
2 changes: 1 addition & 1 deletion src/rle.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import options
import std/options

# {{{ RLE encoder

Expand Down
2 changes: 1 addition & 1 deletion src/selection.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import options
import std/options

import common
import rect
Expand Down
6 changes: 3 additions & 3 deletions src/theme.nim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import options
import streams
import strformat
import std/options
import std/streams
import std/strformat

import koi
import nanovg
Expand Down
10 changes: 5 additions & 5 deletions src/utils.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import hashes
import options
import strutils
import times
import typetraits
import std/hashes
import std/options
import std/strutils
import std/times
import std/typetraits

import common

Expand Down

0 comments on commit 9345c98

Please sign in to comment.