diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 3d093d44d9..87bcf6e3e3 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -5,7 +5,7 @@ import * as yaml from "https://deno.land/std@0.173.0/encoding/yaml.ts"; // Bump this number when you want to purge the cache. // Note: the tools/release/01_bump_crate_versions.ts script will update this version // automatically via regex, so ensure that this line maintains this format. -const cacheVersion = 65; +const cacheVersion = 66; const ubuntuRunner = "ubuntu-22.04"; const ubuntuXlRunner = "ubuntu-22.04-xl"; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f007fac794..6c20e37799 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -329,8 +329,8 @@ jobs: path: |- ~/.cargo/registry/index ~/.cargo/registry/cache - key: '65-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' - restore-keys: '65-cargo-home-${{ matrix.os }}' + key: '66-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' + restore-keys: '66-cargo-home-${{ matrix.os }}' if: '!(matrix.skip)' - name: Restore cache build output (PR) uses: actions/cache/restore@v3 @@ -342,7 +342,7 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: never_saved - restore-keys: '65-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' + restore-keys: '66-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' - name: Apply and update mtime cache if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))' uses: ./.github/mtime_cache @@ -639,7 +639,7 @@ jobs: !./target/*/gn_out !./target/*/*.zip !./target/*/*.tar.gz - key: '65-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' + key: '66-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' publish-canary: name: publish canary runs-on: ubuntu-22.04 diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 0ddffbe3c7..6366ce2603 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -17,9 +17,7 @@ use deno_semver::npm::NpmPackageReqReference; use indexmap::IndexMap; pub use deno_config::BenchConfig; -pub use deno_config::CompilerOptions; pub use deno_config::ConfigFile; -pub use deno_config::EmitConfigOptions; pub use deno_config::FilesConfig; pub use deno_config::FmtOptionsConfig; pub use deno_config::JsxImportSourceConfig; diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs index c0189b83ba..87ad23b10c 100644 --- a/cli/cache/mod.rs +++ b/cli/cache/mod.rs @@ -45,7 +45,6 @@ pub use disk_cache::DiskCache; pub use emit::EmitCache; pub use incremental::IncrementalCache; pub use module_info::ModuleInfoCache; -pub use module_info::ModuleInfoCacheModuleAnalyzer; pub use node::NodeAnalysisCache; pub use parsed_source::ParsedSourceCache; @@ -95,7 +94,6 @@ pub type GlobalHttpCache = deno_cache_dir::GlobalHttpCache; pub type LocalHttpCache = deno_cache_dir::LocalHttpCache; pub type LocalLspHttpCache = deno_cache_dir::LocalLspHttpCache; -pub use deno_cache_dir::CachedUrlMetadata; pub use deno_cache_dir::HttpCache; /// A "wrapper" for the FileFetcher and DiskCache for the Deno CLI that provides diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs index 2bff545c09..88ca47f679 100644 --- a/cli/lsp/analysis.rs +++ b/cli/lsp/analysis.rs @@ -423,11 +423,11 @@ fn fix_ts_import_action( if action.fix_name == "import" { let change = action .changes - .get(0) + .first() .ok_or_else(|| anyhow!("Unexpected action changes."))?; let text_change = change .text_changes - .get(0) + .first() .ok_or_else(|| anyhow!("Missing text change."))?; if let Some(captures) = IMPORT_SPECIFIER_RE.captures(&text_change.new_text) { diff --git a/cli/lsp/code_lens.rs b/cli/lsp/code_lens.rs index 5330be5da5..f2ac248408 100644 --- a/cli/lsp/code_lens.rs +++ b/cli/lsp/code_lens.rs @@ -98,7 +98,7 @@ impl DenoTestCollector { } fn check_call_expr(&mut self, node: &ast::CallExpr, range: &SourceRange) { - if let Some(expr) = node.args.get(0).map(|es| es.expr.as_ref()) { + if let Some(expr) = node.args.first().map(|es| es.expr.as_ref()) { match expr { ast::Expr::Object(obj_lit) => { for prop in &obj_lit.props { diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index b618495bd0..e7839de3be 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -932,7 +932,7 @@ impl Config { } pub fn root_uri(&self) -> Option<&Url> { - self.workspace_folders.get(0).map(|p| &p.0) + self.workspace_folders.first().map(|p| &p.0) } pub fn maybe_node_modules_dir_path(&self) -> Option<&PathBuf> { @@ -1184,7 +1184,7 @@ fn specifier_enabled( return true; }; let (settings, mut folder_uri) = settings.get_for_specifier(specifier); - folder_uri = folder_uri.or_else(|| workspace_folders.get(0).map(|f| &f.0)); + folder_uri = folder_uri.or_else(|| workspace_folders.first().map(|f| &f.0)); let mut disable_paths = vec![]; let mut enable_paths = None; if let Some(folder_uri) = folder_uri { diff --git a/cli/lsp/testing/collectors.rs b/cli/lsp/testing/collectors.rs index 9781672c60..a66e56948b 100644 --- a/cli/lsp/testing/collectors.rs +++ b/cli/lsp/testing/collectors.rs @@ -23,7 +23,7 @@ fn visit_arrow( test_module: &mut TestModule, ) { if let Some((maybe_test_context, maybe_step_var)) = - parse_test_context_param(arrow_expr.params.get(0)) + parse_test_context_param(arrow_expr.params.first()) { let mut collector = TestStepCollector::new( maybe_test_context, @@ -44,7 +44,7 @@ fn visit_fn( test_module: &mut TestModule, ) { if let Some((maybe_test_context, maybe_step_var)) = - parse_test_context_param(function.params.get(0).map(|p| &p.pat)) + parse_test_context_param(function.params.first().map(|p| &p.pat)) { let mut collector = TestStepCollector::new( maybe_test_context, @@ -136,7 +136,7 @@ fn visit_call_expr( text_info: &SourceTextInfo, test_module: &mut TestModule, ) { - if let Some(expr) = node.args.get(0).map(|es| es.expr.as_ref()) { + if let Some(expr) = node.args.first().map(|es| es.expr.as_ref()) { match expr { ast::Expr::Object(obj_lit) => { let mut maybe_name = None; diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs index ae93212c1b..78aff93abd 100644 --- a/cli/tests/integration/lsp_tests.rs +++ b/cli/tests/integration/lsp_tests.rs @@ -4481,7 +4481,7 @@ fn test_lsp_code_actions_ordering() { let action = action.as_object_mut().unwrap(); let title = action.get("title").unwrap().as_str().unwrap().to_string(); let diagnostics = action.get("diagnostics").unwrap().as_array().unwrap(); - let diagnostic = diagnostics.get(0).unwrap().as_object().unwrap(); + let diagnostic = diagnostics.first().unwrap().as_object().unwrap(); let source = diagnostic.get("source").unwrap(); let source = source.as_str().unwrap().to_string(); action.clear(); diff --git a/cli/tools/coverage/merge.rs b/cli/tools/coverage/merge.rs index 9c6a3e93d8..81317df559 100644 --- a/cli/tools/coverage/merge.rs +++ b/cli/tools/coverage/merge.rs @@ -347,7 +347,7 @@ fn merge_range_tree_children<'a>( let mut result: Vec<&'a mut RangeTree<'a>> = Vec::new(); for event in events.iter() { let mut matching_trees: Vec<&'a mut RangeTree<'a>> = Vec::new(); - for (_parent_index, children) in child_forests.iter_mut().enumerate() { + for children in child_forests.iter_mut() { let next_tree: Option<&'a mut RangeTree<'a>> = { if children .peek() diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs index 3a1a10c39e..9c42a5fd9d 100644 --- a/cli/tools/coverage/mod.rs +++ b/cli/tools/coverage/mod.rs @@ -364,7 +364,6 @@ fn generate_coverage_report( line_counts .into_iter() .enumerate() - .map(|(index, count)| (index, count)) .collect::>() }; diff --git a/cli/tools/task.rs b/cli/tools/task.rs index db59773916..ffeea74605 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -255,7 +255,7 @@ impl ShellCommand for NpxCommand { &self, mut context: ShellCommandContext, ) -> LocalBoxFuture<'static, ExecuteResult> { - if let Some(first_arg) = context.args.get(0).cloned() { + if let Some(first_arg) = context.args.first().cloned() { if let Some(command) = context.state.resolve_command(&first_arg) { let context = ShellCommandContext { args: context.args.iter().skip(1).cloned().collect::>(), diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs index f745597b62..4e9b6110b4 100644 --- a/cli/tsc/mod.rs +++ b/cli/tsc/mod.rs @@ -50,7 +50,6 @@ mod diagnostics; pub use self::diagnostics::Diagnostic; pub use self::diagnostics::DiagnosticCategory; -pub use self::diagnostics::DiagnosticMessageChain; pub use self::diagnostics::Diagnostics; pub use self::diagnostics::Position; diff --git a/ext/crypto/import_key.rs b/ext/crypto/import_key.rs index b939c610c5..409ffe7beb 100644 --- a/ext/crypto/import_key.rs +++ b/ext/crypto/import_key.rs @@ -563,8 +563,8 @@ fn import_key_ec_jwk( // Import using ring, to validate key let key_alg = match named_curve { - EcNamedCurve::P256 => CryptoNamedCurve::P256.try_into()?, - EcNamedCurve::P384 => CryptoNamedCurve::P256.try_into()?, + EcNamedCurve::P256 => CryptoNamedCurve::P256.into(), + EcNamedCurve::P384 => CryptoNamedCurve::P256.into(), EcNamedCurve::P521 => { return Err(data_error("Unsupported named curve")) } @@ -667,8 +667,8 @@ fn import_key_ec( // 10. if let Some(pk_named_curve) = pk_named_curve { let signing_alg = match pk_named_curve { - EcNamedCurve::P256 => CryptoNamedCurve::P256.try_into()?, - EcNamedCurve::P384 => CryptoNamedCurve::P384.try_into()?, + EcNamedCurve::P256 => CryptoNamedCurve::P256.into(), + EcNamedCurve::P384 => CryptoNamedCurve::P384.into(), EcNamedCurve::P521 => { return Err(data_error("Unsupported named curve")) } diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs index 294ade683a..5e99e99dfe 100644 --- a/ext/crypto/lib.rs +++ b/ext/crypto/lib.rs @@ -266,7 +266,7 @@ pub async fn op_crypto_sign_key( } Algorithm::Ecdsa => { let curve: &EcdsaSigningAlgorithm = - args.named_curve.ok_or_else(not_supported)?.try_into()?; + args.named_curve.ok_or_else(not_supported)?.into(); let rng = RingRand::SystemRandom::new(); let key_pair = EcdsaKeyPair::from_pkcs8(curve, &args.key.data, &rng)?; @@ -387,9 +387,9 @@ pub async fn op_crypto_verify_key( } Algorithm::Ecdsa => { let signing_alg: &EcdsaSigningAlgorithm = - args.named_curve.ok_or_else(not_supported)?.try_into()?; + args.named_curve.ok_or_else(not_supported)?.into(); let verify_alg: &EcdsaVerificationAlgorithm = - args.named_curve.ok_or_else(not_supported)?.try_into()?; + args.named_curve.ok_or_else(not_supported)?.into(); let private_key; diff --git a/runtime/ops/process.rs b/runtime/ops/process.rs index 5fee08383a..bda6045aca 100644 --- a/runtime/ops/process.rs +++ b/runtime/ops/process.rs @@ -706,7 +706,7 @@ mod deprecated { let env = run_args.env; let cwd = run_args.cwd; - let mut c = Command::new(args.get(0).unwrap()); + let mut c = Command::new(args.first().unwrap()); (1..args.len()).for_each(|i| { let arg = args.get(i).unwrap(); c.arg(arg); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4bd1ede5ba..c1f5c7bd1f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.74.1" +channel = "1.75.0" components = ["rustfmt", "clippy"]