Revert "deps cleanup"

This reverts commit 8ecb652.

cli/args/config_file.rs

@@ -1,11 +1,11 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::collections::BTreeMap;
-use std::collections::HashMap;
-use std::collections::HashSet;
-use std::fmt;
-use std::path::Path;
-use std::path::PathBuf;
+use crate::args::ConfigFlag;
+use crate::args::Flags;
+use crate::args::TaskFlags;
+use crate::util::fs::canonicalize_path;
+use crate::util::path::specifier_parent;
+use crate::util::path::specifier_to_file_path;
 
 use deno_core::anyhow::anyhow;
 use deno_core::anyhow::bail;
@@ -18,13 +18,12 @@ use deno_core::serde_json;
 use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
 use deno_core::ModuleSpecifier;
-
-use crate::args::ConfigFlag;
-use crate::args::Flags;
-use crate::args::TaskFlags;
-use crate::util::fs::canonicalize_path;
-use crate::util::path::specifier_parent;
-use crate::util::path::specifier_to_file_path;
+use std::collections::BTreeMap;
+use std::collections::HashMap;
+use std::collections::HashSet;
+use std::fmt;
+use std::path::Path;
+use std::path::PathBuf;
 
 pub type MaybeImportsResult =
  Result<Option<Vec<(ModuleSpecifier, Vec<String>)>>, AnyError>;

cli/args/flags.rs

@@ -1,13 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::env;
-use std::net::SocketAddr;
-use std::num::NonZeroU32;
-use std::num::NonZeroU8;
-use std::num::NonZeroUsize;
-use std::path::PathBuf;
-use std::str::FromStr;
-
 use clap::Arg;
 use clap::ArgMatches;
 use clap::ColorChoice;
@@ -21,6 +13,13 @@ use deno_runtime::permissions::parse_sys_kind;
 use log::debug;
 use log::Level;
 use once_cell::sync::Lazy;
+use std::env;
+use std::net::SocketAddr;
+use std::num::NonZeroU32;
+use std::num::NonZeroU8;
+use std::num::NonZeroUsize;
+use std::path::PathBuf;
+use std::str::FromStr;
 
 use super::flags_allow_net;
 

cli/args/flags_allow_net.rs

@@ -1,10 +1,9 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
+use deno_core::url::Url;
 use std::net::IpAddr;
 use std::str::FromStr;
 
-use deno_core::url::Url;
-
 #[derive(Debug, PartialEq, Eq)]
 pub struct ParsePortError(String);
 

cli/args/lockfile.rs

@@ -1,5 +1,4 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-
 use std::collections::BTreeMap;
 use std::io::Write;
 use std::path::PathBuf;

cli/args/mod.rs

@@ -6,30 +6,6 @@ mod lockfile;
 
 mod flags_allow_net;
 
-use std::collections::BTreeMap;
-use std::env;
-use std::io::BufReader;
-use std::net::SocketAddr;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use deno_ast::ModuleSpecifier;
-use deno_core::anyhow::anyhow;
-use deno_core::anyhow::bail;
-use deno_core::anyhow::Context;
-use deno_core::error::AnyError;
-use deno_core::normalize_path;
-use deno_core::parking_lot::Mutex;
-use deno_core::url::Url;
-use deno_runtime::colors;
-use deno_runtime::deno_tls::rustls;
-use deno_runtime::deno_tls::rustls::RootCertStore;
-use deno_runtime::deno_tls::rustls_native_certs::load_native_certs;
-use deno_runtime::deno_tls::rustls_pemfile;
-use deno_runtime::deno_tls::webpki_roots;
-use deno_runtime::inspector_server::InspectorServer;
-use deno_runtime::permissions::PermissionsOptions;
-
 pub use config_file::BenchConfig;
 pub use config_file::CompilerOptions;
 pub use config_file::ConfigFile;
@@ -47,10 +23,33 @@ pub use config_file::TsConfig;
 pub use config_file::TsConfigForEmit;
 pub use config_file::TsConfigType;
 pub use config_file::TsTypeLib;
+use deno_runtime::deno_tls::rustls;
+use deno_runtime::deno_tls::rustls_native_certs::load_native_certs;
+use deno_runtime::deno_tls::rustls_pemfile;
+use deno_runtime::deno_tls::webpki_roots;
 pub use flags::*;
 pub use lockfile::Lockfile;
 pub use lockfile::LockfileError;
 
+use deno_ast::ModuleSpecifier;
+use deno_core::anyhow::anyhow;
+use deno_core::anyhow::bail;
+use deno_core::anyhow::Context;
+use deno_core::error::AnyError;
+use deno_core::normalize_path;
+use deno_core::parking_lot::Mutex;
+use deno_core::url::Url;
+use deno_runtime::colors;
+use deno_runtime::deno_tls::rustls::RootCertStore;
+use deno_runtime::inspector_server::InspectorServer;
+use deno_runtime::permissions::PermissionsOptions;
+use std::collections::BTreeMap;
+use std::env;
+use std::io::BufReader;
+use std::net::SocketAddr;
+use std::path::PathBuf;
+use std::sync::Arc;
+
 use crate::cache::DenoDir;
 use crate::util::fs::canonicalize_path_maybe_not_exists;
 use crate::version;

cli/auth_tokens.rs

@@ -1,10 +1,9 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::fmt;
-
 use deno_core::ModuleSpecifier;
 use log::debug;
 use log::error;
+use std::fmt;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum AuthTokenData {

cli/cache/deno_dir.rs

@@ -1,9 +1,9 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::path::PathBuf;
-
 use super::DiskCache;
 
+use std::path::PathBuf;
+
 /// `DenoDir` serves as coordinator for multiple `DiskCache`s containing them
 /// in single directory that can be controlled with `$DENO_DIR` env variable.
 #[derive(Clone)]

cli/cache/disk_cache.rs

@@ -1,5 +1,11 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
+use super::http_cache::url_to_filename;
+use super::CACHE_PERM;
+use crate::util::fs::atomic_write_file;
+
+use deno_core::url::Host;
+use deno_core::url::Url;
 use std::ffi::OsStr;
 use std::fs;
 use std::io;
@@ -9,14 +15,6 @@ use std::path::PathBuf;
 use std::path::Prefix;
 use std::str;
 
-use deno_core::url::Host;
-use deno_core::url::Url;
-
-use crate::util::fs::atomic_write_file;
-
-use super::http_cache::url_to_filename;
-use super::CACHE_PERM;
-
 #[derive(Clone)]
 pub struct DiskCache {
  pub location: PathBuf,

cli/cache/http_cache.rs

@@ -3,24 +3,21 @@
 //! as defined in RFC 7234 (<https://tools.ietf.org/html/rfc7234>).
 //! Currently it's a very simplified version to fulfill Deno needs
 //! at hand.
-
-use std::fs;
-use std::fs::File;
-use std::io;
-use std::path::Path;
-use std::path::PathBuf;
-use std::time::SystemTime;
-
+use crate::http_util::HeadersMap;
+use crate::util;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::serde::Deserialize;
 use deno_core::serde::Serialize;
 use deno_core::serde_json;
 use deno_core::url::Url;
 use log::error;
-
-use crate::http_util::HeadersMap;
-use crate::util;
+use std::fs;
+use std::fs::File;
+use std::io;
+use std::path::Path;
+use std::path::PathBuf;
+use std::time::SystemTime;
 
 use super::CACHE_PERM;
 

cli/cache/mod.rs

@@ -1,6 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::sync::Arc;
+use crate::errors::get_error_class_name;
+use crate::file_fetcher::FileFetcher;
+use crate::npm;
 
 use deno_core::futures;
 use deno_core::futures::FutureExt;
@@ -10,10 +12,7 @@ use deno_graph::source::LoadFuture;
 use deno_graph::source::LoadResponse;
 use deno_graph::source::Loader;
 use deno_runtime::permissions::Permissions;
-
-use crate::errors::get_error_class_name;
-use crate::file_fetcher::FileFetcher;
-use crate::npm;
+use std::sync::Arc;
 
 mod check;
 mod common;

cli/cache/node.rs

@@ -1,8 +1,6 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
 use std::path::Path;
-use std::path::PathBuf;
-use std::sync::Arc;
 
 use deno_ast::CjsAnalysis;
 use deno_core::error::AnyError;
@@ -12,6 +10,8 @@ use deno_runtime::deno_webstorage::rusqlite::params;
 use deno_runtime::deno_webstorage::rusqlite::Connection;
 use serde::Deserialize;
 use serde::Serialize;
+use std::path::PathBuf;
+use std::sync::Arc;
 
 use super::common::run_sqlite_pragma;
 use super::FastInsecureHasher;

cli/cache/parsed_source.rs

@@ -1,5 +1,3 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-
 use std::collections::HashMap;
 use std::path::Path;
 use std::path::PathBuf;

cli/ops/bench.rs

@@ -1,9 +1,6 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering;
-use std::time;
-
+use crate::tools::bench::BenchDescription;
+use crate::tools::bench::BenchEvent;
+use crate::tools::test::TestFilter;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::op;
@@ -15,13 +12,12 @@ use deno_runtime::permissions::ChildPermissionsArg;
 use deno_runtime::permissions::Permissions;
 use serde::Deserialize;
 use serde::Serialize;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+use std::time;
 use tokio::sync::mpsc::UnboundedSender;
 use uuid::Uuid;
 
-use crate::tools::bench::BenchDescription;
-use crate::tools::bench::BenchEvent;
-use crate::tools::test::TestFilter;
-
 pub fn init(
  sender: UnboundedSender<BenchEvent>,
  filter: TestFilter,

cli/ops/mod.rs

@@ -1,12 +1,11 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
+use crate::proc_state::ProcState;
 use deno_core::error::AnyError;
 use deno_core::op;
 use deno_core::Extension;
 use deno_core::OpState;
 
-use crate::proc_state::ProcState;
-
 pub mod bench;
 pub mod testing;
 

cli/ops/testing.rs

@@ -1,7 +1,13 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering;
+use crate::tools::test::FailFastTracker;
+use crate::tools::test::TestDescription;
+use crate::tools::test::TestEvent;
+use crate::tools::test::TestEventSender;
+use crate::tools::test::TestFilter;
+use crate::tools::test::TestLocation;
+use crate::tools::test::TestResult;
+use crate::tools::test::TestStepDescription;
 
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
@@ -15,17 +21,10 @@ use deno_runtime::permissions::Permissions;
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
 use uuid::Uuid;
 
-use crate::tools::test::FailFastTracker;
-use crate::tools::test::TestDescription;
-use crate::tools::test::TestEvent;
-use crate::tools::test::TestEventSender;
-use crate::tools::test::TestFilter;
-use crate::tools::test::TestLocation;
-use crate::tools::test::TestResult;
-use crate::tools::test::TestStepDescription;
-
 pub fn init(
  sender: TestEventSender,
  fail_fast_tracker: FailFastTracker,

cli/util/console.rs

@@ -1,5 +1,3 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-
 use deno_runtime::ops::tty::ConsoleSize;
 
 /// Gets the console size.

cli/util/diff.rs

@@ -1,10 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::fmt::Write as _;
-
-use dissimilar::{diff as difference, Chunk};
-
 use crate::colors;
+use dissimilar::{diff as difference, Chunk};
+use std::fmt::Write as _;
 
 /// Print diff of the same file_path, before and after formatting.
 ///

cli/util/display.rs

@@ -1,9 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use std::io::Write;
-
 use deno_core::error::AnyError;
 use deno_core::serde_json;
+use std::io::Write;
 
 /// A function that converts a float to a string the represents a human
 /// readable version of that number.