diff options
| author | Axetroy <axetroy.dev@gmail.com> | 2019-12-23 22:59:44 +0800 |
|---|---|---|
| committer | Ry Dahl <ry@tinyclouds.org> | 2019-12-23 09:59:44 -0500 |
| commit | 3bb15ceaeaf5cd349afcb2e2d43374efd420aaef (patch) | |
| tree | b169369521f66bbca1c71a96f0059bef6d61fe00 /core | |
| parent | e88c801e76c16d4c0a92702e248cf811038ed4ab (diff) | |
Upgrades rust to 1.40.0 (#3542)
Diffstat (limited to 'core')
| -rw-r--r-- | core/examples/http_bench.rs | 2 | ||||
| -rw-r--r-- | core/module_specifier.rs | 8 | ||||
| -rw-r--r-- | core/modules.rs | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/examples/http_bench.rs b/core/examples/http_bench.rs index c08c5b6e1..a79e3fc20 100644 --- a/core/examples/http_bench.rs +++ b/core/examples/http_bench.rs @@ -117,7 +117,7 @@ fn http_op( let record = Record::from(control); let is_sync = record.promise_id == 0; let op = handler(record.clone(), zero_copy_buf); - let mut record_a = record.clone(); + let mut record_a = record; let fut = async move { match op.await { diff --git a/core/module_specifier.rs b/core/module_specifier.rs index ad24616ff..dd5347a33 100644 --- a/core/module_specifier.rs +++ b/core/module_specifier.rs @@ -402,7 +402,7 @@ mod tests { ); tests.extend(vec![ (r"/deno/tests/006_url_imports.ts", expected_url.to_string()), - (r"\deno\tests\006_url_imports.ts", expected_url.to_string()), + (r"\deno\tests\006_url_imports.ts", expected_url), ]); // Relative local path. @@ -413,8 +413,8 @@ mod tests { tests.extend(vec![ (r"tests/006_url_imports.ts", expected_url.to_string()), (r"tests\006_url_imports.ts", expected_url.to_string()), - (r"./tests/006_url_imports.ts", expected_url.to_string()), - (r".\tests\006_url_imports.ts", expected_url.to_string()), + (r"./tests/006_url_imports.ts", (*expected_url).to_string()), + (r".\tests\006_url_imports.ts", (*expected_url).to_string()), ]); // UNC network path. @@ -437,7 +437,7 @@ mod tests { let expected_url = format!("file://{}/tests/006_url_imports.ts", cwd_str); tests.extend(vec![ ("tests/006_url_imports.ts", expected_url.to_string()), - ("./tests/006_url_imports.ts", expected_url.to_string()), + ("./tests/006_url_imports.ts", expected_url), ]); } diff --git a/core/modules.rs b/core/modules.rs index 3f431d36d..722fa2cbe 100644 --- a/core/modules.rs +++ b/core/modules.rs @@ -186,7 +186,7 @@ impl<L: Loader + Unpin> RecursiveLoad<L> { { let fut = self .loader - .load(&module_specifier, Some(referrer_specifier.clone())); + .load(&module_specifier, Some(referrer_specifier)); self.pending.push(fut.boxed()); self.is_pending.insert(module_specifier); } @@ -879,7 +879,7 @@ mod tests { let loads = loader.loads.clone(); let recursive_load = RecursiveLoad::main("/circular1.js", None, loader, modules); - let mut load_fut = recursive_load.get_future(isolate.clone()).boxed(); + let mut load_fut = recursive_load.get_future(isolate).boxed(); let result = Pin::new(&mut load_fut).poll(&mut cx); assert!(result.is_ready()); if let Poll::Ready(Ok(circular1_id)) = result { @@ -951,7 +951,7 @@ mod tests { let loads = loader.loads.clone(); let recursive_load = RecursiveLoad::main("/redirect1.js", None, loader, modules); - let mut load_fut = recursive_load.get_future(isolate.clone()).boxed(); + let mut load_fut = recursive_load.get_future(isolate).boxed(); let result = Pin::new(&mut load_fut).poll(&mut cx); println!(">> result {:?}", result); assert!(result.is_ready()); |