Use at_exit handlers where possible to reduce code duplication

crystal-lang · Dec 20, 2017 · 00d23ab · 00d23ab
1 parent 49028a1
commit 00d23ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/crystal/main.cr b/src/crystal/main.cr
@@ -47,6 +47,11 @@ module Crystal
     GC.init
 
     remember_blocking_state
+    at_exit do
+      STDOUT.flush
+      STDERR.flush
+      restore_blocking_state
+    end
 
     status =
       begin
@@ -56,15 +61,9 @@ module Crystal
         1
       end
 
-    status = AtExitHandlers.run status
-
     ex.inspect_with_backtrace STDERR if ex
-    STDOUT.flush
-    STDERR.flush
-
-    restore_blocking_state
 
-    status
+    AtExitHandlers.run status
   end
 
   # Main method run by all Crystal programs at startup.

diff --git a/src/kernel.cr b/src/kernel.cr
@@ -170,8 +170,6 @@ end
 # Registered `at_exit` procs are executed.
 def exit(status = 0) : NoReturn
   status = AtExitHandlers.run status
-  STDOUT.flush
-  STDERR.flush
   Process.exit(status)
 end