From 6fa6828e5f0f7abac20ec342ee5ec57654a425d0 Mon Sep 17 00:00:00 2001
From: Gurwinder Singh <vargwin@gmail.com>
Date: Sun, 23 Jun 2019 17:19:49 +0530
Subject: Minor tweaks (#2569)

1. Separate Snapshot and Script StartupData functions based on cfg "no-snapshot-init"
2. Replace deprecated Once::ONCE_INIT with Once::new (https://github.com/rust-lang/rust/pull/61757)
3. Elide lifetime
4. Fix typos
---
 cli/startup_data.rs | 103 +++++++++++++++++++++++++++-------------------------
 1 file changed, 54 insertions(+), 49 deletions(-)

(limited to 'cli')

diff --git a/cli/startup_data.rs b/cli/startup_data.rs
index 62218fdef..e7d0a08a8 100644
--- a/cli/startup_data.rs
+++ b/cli/startup_data.rs
@@ -1,56 +1,61 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-use deno::{Script, StartupData};
+#[cfg(feature = "no-snapshot-init")]
+use deno::Script;
 
+use deno::StartupData;
+
+#[cfg(feature = "no-snapshot-init")]
+pub fn deno_isolate_init() -> StartupData<'static> {
+  debug!("Deno isolate init without snapshots.");
+  #[cfg(not(feature = "check-only"))]
+  let source =
+    include_str!(concat!(env!("GN_OUT_DIR"), "/gen/cli/bundle/main.js"));
+  #[cfg(feature = "check-only")]
+  let source = "";
+
+  StartupData::Script(Script {
+    filename: "gen/cli/bundle/main.js",
+    source,
+  })
+}
+
+#[cfg(not(feature = "no-snapshot-init"))]
 pub fn deno_isolate_init() -> StartupData<'static> {
-  if cfg!(feature = "no-snapshot-init") {
-    debug!("Deno isolate init without snapshots.");
-    #[cfg(not(feature = "check-only"))]
-    let source_bytes =
-      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/cli/bundle/main.js"));
-    #[cfg(feature = "check-only")]
-    let source_bytes = b"";
-
-    StartupData::Script(Script {
-      filename: "gen/cli/bundle/main.js",
-      source: std::str::from_utf8(&source_bytes[..]).unwrap(),
-    })
-  } else {
-    debug!("Deno isolate init with snapshots.");
-    #[cfg(not(any(feature = "check-only", feature = "no-snapshot-init")))]
-    let data =
-      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/cli/snapshot_deno.bin"));
-    #[cfg(any(feature = "check-only", feature = "no-snapshot-init"))]
-    let data = b"";
-
-    StartupData::Snapshot(data)
-  }
+  debug!("Deno isolate init with snapshots.");
+  #[cfg(not(feature = "check-only"))]
+  let data =
+    include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/cli/snapshot_deno.bin"));
+  #[cfg(feature = "check-only")]
+  let data = b"";
+
+  StartupData::Snapshot(data)
 }
 
+#[cfg(feature = "no-snapshot-init")]
 pub fn compiler_isolate_init() -> StartupData<'static> {
-  if cfg!(feature = "no-snapshot-init") {
-    debug!("Compiler isolate init without snapshots.");
-    #[cfg(not(feature = "check-only"))]
-    let source_bytes = include_bytes!(concat!(
-      env!("GN_OUT_DIR"),
-      "/gen/cli/bundle/compiler.js"
-    ));
-    #[cfg(feature = "check-only")]
-    let source_bytes = b"";
-
-    StartupData::Script(Script {
-      filename: "gen/cli/bundle/compiler.js",
-      source: std::str::from_utf8(&source_bytes[..]).unwrap(),
-    })
-  } else {
-    debug!("Deno isolate init with snapshots.");
-    #[cfg(not(any(feature = "check-only", feature = "no-snapshot-init")))]
-    let data = include_bytes!(concat!(
-      env!("GN_OUT_DIR"),
-      "/gen/cli/snapshot_compiler.bin"
-    ));
-    #[cfg(any(feature = "check-only", feature = "no-snapshot-init"))]
-    let data = b"";
-
-    StartupData::Snapshot(data)
-  }
+  debug!("Compiler isolate init without snapshots.");
+  #[cfg(not(feature = "check-only"))]
+  let source =
+    include_str!(concat!(env!("GN_OUT_DIR"), "/gen/cli/bundle/compiler.js"));
+  #[cfg(feature = "check-only")]
+  let source = "";
+
+  StartupData::Script(Script {
+    filename: "gen/cli/bundle/compiler.js",
+    source,
+  })
+}
+
+#[cfg(not(feature = "no-snapshot-init"))]
+pub fn compiler_isolate_init() -> StartupData<'static> {
+  debug!("Deno isolate init with snapshots.");
+  #[cfg(not(feature = "check-only"))]
+  let data = include_bytes!(concat!(
+    env!("GN_OUT_DIR"),
+    "/gen/cli/snapshot_compiler.bin"
+  ));
+  #[cfg(feature = "check-only")]
+  let data = b"";
+
+  StartupData::Snapshot(data)
 }
-- 
cgit v1.2.3