diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2021-01-02 13:52:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-02 13:52:42 +0100 |
commit | 41a4a34aee57a4690e5c1b9ba54b27a7035bac37 (patch) | |
tree | 11d9ec87232947515e8c68488119dc1670833e68 /cli | |
parent | 88855b5d95be04747ec0ff67d8b33dfde3189641 (diff) |
upgrade: Rust 1.49.0 (#8955)
Diffstat (limited to 'cli')
-rw-r--r-- | cli/module_graph.rs | 9 | ||||
-rw-r--r-- | cli/standalone.rs | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/cli/module_graph.rs b/cli/module_graph.rs index d1e51bd4c..e86732b24 100644 --- a/cli/module_graph.rs +++ b/cli/module_graph.rs @@ -2300,10 +2300,11 @@ pub mod tests { .expect("should have checked"); assert!(result_info.maybe_ignored_options.is_none()); assert!(result_info.diagnostics.is_empty()); - let h = handler.lock().unwrap(); - assert_eq!(h.version_calls.len(), 2); - let ver0 = h.version_calls[0].1.clone(); - let ver1 = h.version_calls[1].1.clone(); + let (ver0, ver1) = { + let h = handler.lock().unwrap(); + assert_eq!(h.version_calls.len(), 2); + (h.version_calls[0].1.clone(), h.version_calls[1].1.clone()) + }; // let's do it all over again to ensure that the versions are determinstic let (graph, handler) = setup(specifier).await; diff --git a/cli/standalone.rs b/cli/standalone.rs index fea42fc96..af38fd4eb 100644 --- a/cli/standalone.rs +++ b/cli/standalone.rs @@ -107,10 +107,12 @@ impl ModuleLoader for EmbeddedModuleLoader { } async fn run(source_code: String, args: Vec<String>) -> Result<(), AnyError> { - let mut flags = Flags::default(); - flags.argv = args[1..].to_vec(); - // TODO(lucacasonato): remove once you can specify this correctly through embedded metadata - flags.unstable = true; + let flags = Flags { + argv: args[1..].to_vec(), + // TODO(lucacasonato): remove once you can specify this correctly through embedded metadata + unstable: true, + ..Default::default() + }; let main_module = ModuleSpecifier::resolve_url(SPECIFIER)?; let permissions = Permissions::allow_all(); let module_loader = Rc::new(EmbeddedModuleLoader(source_code)); |