summaryrefslogtreecommitdiff
path: root/core/isolate.rs
diff options
context:
space:
mode:
authorGurwinder Singh <vargwin@gmail.com>2019-06-23 17:19:49 +0530
committerRyan Dahl <ry@tinyclouds.org>2019-06-23 04:49:49 -0700
commit6fa6828e5f0f7abac20ec342ee5ec57654a425d0 (patch)
treefbf67b9f9652f9ced24b44c3a9331358c83e4a8b /core/isolate.rs
parentb9fbd552149c1fe61b662c9b1a1ed1b42e5487ae (diff)
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
Diffstat (limited to 'core/isolate.rs')
-rw-r--r--core/isolate.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/isolate.rs b/core/isolate.rs
index cdb505342..2e6406e56 100644
--- a/core/isolate.rs
+++ b/core/isolate.rs
@@ -25,7 +25,7 @@ use libc::c_void;
use std::ffi::CStr;
use std::ffi::CString;
use std::ptr::null;
-use std::sync::{Arc, Mutex, Once, ONCE_INIT};
+use std::sync::{Arc, Mutex, Once};
pub type Buf = Box<[u8]>;
@@ -55,8 +55,8 @@ struct OwnedScript {
pub filename: String,
}
-impl<'a> From<Script<'a>> for OwnedScript {
- fn from(s: Script<'a>) -> OwnedScript {
+impl From<Script<'_>> for OwnedScript {
+ fn from(s: Script) -> OwnedScript {
OwnedScript {
source: s.source.to_string(),
filename: s.filename.to_string(),
@@ -133,10 +133,10 @@ impl Drop for Isolate {
}
}
-static DENO_INIT: Once = ONCE_INIT;
+static DENO_INIT: Once = Once::new();
impl Isolate {
- /// startup_data defines the snapshot or script used at startup to initalize
+ /// startup_data defines the snapshot or script used at startup to initialize
/// the isolate.
pub fn new(startup_data: StartupData, will_snapshot: bool) -> Self {
DENO_INIT.call_once(|| {
@@ -157,7 +157,7 @@ impl Isolate {
let mut startup_script: Option<OwnedScript> = None;
- // Seperate into Option values for each startup type
+ // Separate into Option values for each startup type
match startup_data {
StartupData::Script(d) => {
startup_script = Some(d.into());