summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorEvan Typanski <evantypanski@gmail.com>2022-02-28 07:18:41 -0500
committerGitHub <noreply@github.com>2022-02-28 13:18:41 +0100
commit207237cec229171eafbd3357dcf128bdd270332a (patch)
tree8987de70654a89e02b758296992c16cd63ef63a5
parentc870ff5946731dd1deff828abfe07c1900a5b364 (diff)
downloadNim-207237cec229171eafbd3357dcf128bdd270332a.tar.gz
Fix #18662 (#19534)
-rw-r--r--compiler/jsgen.nim4
-rw-r--r--compiler/ropes.nim7
2 files changed, 3 insertions, 8 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim
index 0a7036b46..f4097efa4 100644
--- a/compiler/jsgen.nim
+++ b/compiler/jsgen.nim
@@ -2796,7 +2796,9 @@ proc myClose(graph: ModuleGraph; b: PPassContext, n: PNode): PNode =
       var map: SourceMap
       (code, map) = genSourceMap($(code), outFile.string)
       writeFile(outFile.string & ".map", $(%map))
-    discard writeRopeIfNotEqual(code, outFile)
+    if not equalsFile(code, outFile):
+      if not writeRope(code, outFile):
+        rawMessage(m.config, errCannotOpenFile, outFile.string)
 
 
 proc myOpen(graph: ModuleGraph; s: PSym; idgen: IdGenerator): PPassContext =
diff --git a/compiler/ropes.nim b/compiler/ropes.nim
index 1e7957337..cd696a545 100644
--- a/compiler/ropes.nim
+++ b/compiler/ropes.nim
@@ -329,10 +329,3 @@ proc equalsFile*(r: Rope, filename: AbsoluteFile): bool =
   if result:
     result = equalsFile(r, f)
     close(f)
-
-proc writeRopeIfNotEqual*(r: Rope, filename: AbsoluteFile): bool =
-  # returns true if overwritten
-  if not equalsFile(r, filename):
-    result = writeRope(r, filename)
-  else:
-    result = false