summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2016-01-19 11:06:10 +0100
committerAndreas Rumpf <rumpf_a@web.de>2016-01-19 11:06:10 +0100
commitb18d52dcee32ee20b21b9711b151abfd4347c62a (patch)
treeb5ea76f5bbdb6223726140d1828083a5f8becf1f
parent7d5e965dc8887becd0477680746e2522fa21988b (diff)
parent0dee918de977d4773629108a2a4c0e06ca3b0b3a (diff)
downloadNim-b18d52dcee32ee20b21b9711b151abfd4347c62a.tar.gz
Merge branch 'devel' of https://github.com/nim-lang/Nim into devel
-rw-r--r--compiler/msgs.nim2
-rw-r--r--compiler/vm.nim2
-rw-r--r--compiler/vmgen.nim2
-rw-r--r--lib/impure/rdstdin.nim2
-rw-r--r--lib/pure/nativesockets.nim2
-rw-r--r--lib/pure/net.nim2
-rw-r--r--lib/pure/securehash.nim3
-rw-r--r--web/community.txt7
8 files changed, 14 insertions, 8 deletions
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 649e28cba..a556ad0c5 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -828,7 +828,7 @@ proc quit(msg: TMsgKind) =
 proc log*(s: string) {.procvar.} =
   var f: File
   if open(f, "nimsuggest.log", fmAppend):
-    f.writeln(s)
+    f.writeLine(s)
     close(f)
 
 proc handleError(msg: TMsgKind, eh: TErrorHandling, s: string) =
diff --git a/compiler/vm.nim b/compiler/vm.nim
index 80c2c0fbf..b537700fa 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -15,7 +15,7 @@ const debugEchoCode = false
 import ast except getstr
 
 import
-  strutils, astalgo, msgs, vmdef, vmgen, nimsets, types, passes, unsigned,
+  strutils, astalgo, msgs, vmdef, vmgen, nimsets, types, passes,
   parser, vmdeps, idents, trees, renderer, options, transf, parseutils,
   vmmarshal
 
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index 75c1378e5..e4435294f 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -28,7 +28,7 @@
 # this copy depends on the involved types.
 
 import
-  unsigned, strutils, ast, astalgo, types, msgs, renderer, vmdef,
+  strutils, ast, astalgo, types, msgs, renderer, vmdef,
   trees, intsets, rodread, magicsys, options, lowerings
 
 from os import splitFile
diff --git a/lib/impure/rdstdin.nim b/lib/impure/rdstdin.nim
index b373859f4..15137b436 100644
--- a/lib/impure/rdstdin.nim
+++ b/lib/impure/rdstdin.nim
@@ -100,7 +100,7 @@ when defined(Windows):
     stdout.write "\n"
 
 else:
-  import linenoise, termios, unsigned
+  import linenoise, termios
 
   proc readLineFromStdin*(prompt: string): TaintedString {.
                           tags: [ReadIOEffect, WriteIOEffect].} =
diff --git a/lib/pure/nativesockets.nim b/lib/pure/nativesockets.nim
index b5a8d5777..3951b46a3 100644
--- a/lib/pure/nativesockets.nim
+++ b/lib/pure/nativesockets.nim
@@ -12,7 +12,7 @@
 
 # TODO: Clean up the exports a bit and everything else in general.
 
-import unsigned, os
+import os
 
 when hostOS == "solaris":
   {.passl: "-lsocket -lnsl".}
diff --git a/lib/pure/net.nim b/lib/pure/net.nim
index d1016011e..1cfaf029f 100644
--- a/lib/pure/net.nim
+++ b/lib/pure/net.nim
@@ -10,7 +10,7 @@
 ## This module implements a high-level cross-platform sockets interface.
 
 {.deadCodeElim: on.}
-import nativesockets, os, strutils, unsigned, parseutils, times
+import nativesockets, os, strutils, parseutils, times
 export Port, `$`, `==`
 
 const useWinVersion = defined(Windows) or defined(nimdoc)
diff --git a/lib/pure/securehash.nim b/lib/pure/securehash.nim
index 8ac6acb0e..657782889 100644
--- a/lib/pure/securehash.nim
+++ b/lib/pure/securehash.nim
@@ -7,8 +7,7 @@
 #    distribution, for details about the copyright.
 #
 
-import
-  strutils, unsigned
+import strutils
 
 const Sha1DigestSize = 20
 
diff --git a/web/community.txt b/web/community.txt
index b8a6c7372..fba59f946 100644
--- a/web/community.txt
+++ b/web/community.txt
@@ -88,6 +88,13 @@ Nim's Community
 
 .. container:: standout
 
+  Meetup
+  ------
+  
+  The `Nim BR Meetup <http://www.meetup.com/pt-BR/nim-br>`_ is a brazilian user group about Nim where they are having discussions, talks or workshops about Nim programming language.
+
+.. container:: standout
+
   How to help
   -----------