summaryrefslogtreecommitdiff
path: root/cli/args
diff options
context:
space:
mode:
Diffstat (limited to 'cli/args')
-rw-r--r--cli/args/config_file.rs2
-rw-r--r--cli/args/lockfile.rs6
-rw-r--r--cli/args/mod.rs8
3 files changed, 8 insertions, 8 deletions
diff --git a/cli/args/config_file.rs b/cli/args/config_file.rs
index 0a708eeee..0c0e5d2fa 100644
--- a/cli/args/config_file.rs
+++ b/cli/args/config_file.rs
@@ -71,7 +71,7 @@ pub struct IgnoredCompilerOptions {
impl fmt::Display for IgnoredCompilerOptions {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut codes = self.items.clone();
- codes.sort();
+ codes.sort_unstable();
if let Some(specifier) = &self.maybe_specifier {
write!(f, "Unsupported compiler options in \"{}\".\n The following options were ignored:\n {}", specifier, codes.join(", "))
} else {
diff --git a/cli/args/lockfile.rs b/cli/args/lockfile.rs
index 5f690b3a1..87f47255a 100644
--- a/cli/args/lockfile.rs
+++ b/cli/args/lockfile.rs
@@ -1,4 +1,7 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+use std::collections::BTreeMap;
+use std::io::Write;
+use std::path::PathBuf;
use deno_core::anyhow::Context;
use deno_core::error::AnyError;
@@ -6,9 +9,6 @@ use deno_core::serde::Deserialize;
use deno_core::serde::Serialize;
use deno_core::serde_json;
use log::debug;
-use std::collections::BTreeMap;
-use std::io::Write;
-use std::path::PathBuf;
use crate::args::config_file::LockConfig;
use crate::args::ConfigFile;
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 97b70698d..d677cf832 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -329,11 +329,11 @@ impl CliOptions {
// if a location is set, then the ascii serialization of the location is
// used, unless the origin is opaque, and then no storage origin is set, as
// we can't expect the origin to be reproducible
- let storage_origin = location.origin().ascii_serialization();
- if storage_origin == "null" {
- None
+ let storage_origin = location.origin();
+ if storage_origin.is_tuple() {
+ Some(storage_origin.ascii_serialization())
} else {
- Some(storage_origin)
+ None
}
} else if let Some(config_file) = &self.maybe_config_file {
// otherwise we will use the path to the config file