diff --git a/cli/args/flags.rs b/cli/args/flags.rs index 5942b42d4b..60719b29d1 100644 --- a/cli/args/flags.rs +++ b/cli/args/flags.rs @@ -2741,7 +2741,7 @@ fn serve_subcommand() -> Command { .value_parser(serve_host_validator), ) .arg( - parallel_arg("multiple server workers", false) + parallel_arg("multiple server workers") ) .arg(check_arg(false)) .arg(watch_arg(true)) @@ -2915,17 +2915,7 @@ Directory arguments are expanded to all contained files matching the glob .help_heading(TEST_HEADING), ) .arg( - parallel_arg("test modules", true) - ) - .arg( - Arg::new("jobs") - .short('j') - .long("jobs") - .help("deprecated: The `--jobs` flag is deprecated and will be removed in Deno 2.0. Use the `--parallel` flag with possibly the `DENO_JOBS` environment variable instead.") - .hide(true) - .num_args(0..=1) - .value_parser(value_parser!(NonZeroUsize)) - .help_heading(TEST_HEADING), + parallel_arg("test modules") ) .arg( Arg::new("files") @@ -2967,16 +2957,11 @@ Directory arguments are expanded to all contained files matching the glob ) } -fn parallel_arg(descr: &str, jobs_fallback: bool) -> Arg { - let arg = Arg::new("parallel") +fn parallel_arg(descr: &str) -> Arg { + Arg::new("parallel") .long("parallel") .help(format!("Run {descr} in parallel. Parallelism defaults to the number of available CPUs or the value of the DENO_JOBS environment variable")) - .action(ArgAction::SetTrue); - if jobs_fallback { - arg.conflicts_with("jobs") - } else { - arg - } + .action(ArgAction::SetTrue) } fn types_subcommand() -> Command { @@ -4704,7 +4689,7 @@ fn serve_parse( .remove_one::("host") .unwrap_or_else(|| "0.0.0.0".to_owned()); - let worker_count = parallel_arg_parse(matches, false).map(|v| v.get()); + let worker_count = parallel_arg_parse(matches).map(|v| v.get()); runtime_args_parse(flags, matches, true, true); // If the user didn't pass --allow-net, add this port to the network @@ -4780,37 +4765,13 @@ fn task_parse(flags: &mut Flags, matches: &mut ArgMatches) { flags.subcommand = DenoSubcommand::Task(task_flags); } -fn parallel_arg_parse( - matches: &mut ArgMatches, - fallback_to_jobs: bool, -) -> Option { +fn parallel_arg_parse(matches: &mut ArgMatches) -> Option { if matches.get_flag("parallel") { if let Ok(value) = env::var("DENO_JOBS") { value.parse::().ok() } else { std::thread::available_parallelism().ok() } - } else if fallback_to_jobs && matches.contains_id("jobs") { - // We can't change this to use the log crate because its not configured - // yet at this point since the flags haven't been parsed. This flag is - // deprecated though so it's not worth changing the code to use the log - // crate here and this is only done for testing anyway. - #[allow(clippy::print_stderr)] - { - eprintln!( - "⚠️ {}", - crate::colors::yellow(concat!( - "The `--jobs` flag is deprecated and will be removed in Deno 2.0.\n", - "Use the `--parallel` flag with possibly the `DENO_JOBS` environment variable instead.\n", - "Learn more at: https://docs.deno.com/runtime/manual/basics/env_variables" - )), - ); - } - if let Some(value) = matches.remove_one::("jobs") { - Some(value) - } else { - std::thread::available_parallelism().ok() - } } else { None } @@ -4882,7 +4843,7 @@ fn test_parse(flags: &mut Flags, matches: &mut ArgMatches) { flags.argv.extend(script_arg); } - let concurrent_jobs = parallel_arg_parse(matches, true); + let concurrent_jobs = parallel_arg_parse(matches); let include = if let Some(files) = matches.remove_many::("files") { files.collect() @@ -8913,45 +8874,6 @@ mod tests { ); } - #[test] - fn test_with_concurrent_jobs() { - let r = flags_from_vec(svec!["deno", "test", "--jobs=4"]); - assert_eq!( - r.unwrap(), - Flags { - subcommand: DenoSubcommand::Test(TestFlags { - no_run: false, - reporter: Default::default(), - doc: false, - fail_fast: None, - filter: None, - allow_none: false, - shuffle: None, - files: FileFlags { - include: vec![], - ignore: vec![], - }, - concurrent_jobs: Some(NonZeroUsize::new(4).unwrap()), - trace_leaks: false, - coverage_dir: None, - clean: false, - watch: Default::default(), - junit_path: None, - hide_stacktraces: false, - }), - type_check_mode: TypeCheckMode::Local, - permissions: PermissionFlags { - no_prompt: true, - ..Default::default() - }, - ..Flags::default() - } - ); - - let r = flags_from_vec(svec!["deno", "test", "--jobs=0"]); - assert!(r.is_err()); - } - #[test] fn test_with_fail_fast() { let r = flags_from_vec(svec!["deno", "test", "--fail-fast=3"]); diff --git a/tests/integration/test_tests.rs b/tests/integration/test_tests.rs index ed3d9fd426..4bf79a0d2f 100644 --- a/tests/integration/test_tests.rs +++ b/tests/integration/test_tests.rs @@ -154,18 +154,6 @@ itest!(parallel_flag_with_env_variable { output: "test/short-pass.out", }); -itest!(jobs_flag { - args: "test test/short-pass.ts --jobs", - exit_code: 0, - output: "test/short-pass-jobs-flag-warning.out", -}); - -itest!(jobs_flag_with_numeric_value { - args: "test test/short-pass.ts --jobs=2", - exit_code: 0, - output: "test/short-pass-jobs-flag-warning.out", -}); - itest!(load_unload { args: "test test/load_unload.ts", exit_code: 0, diff --git a/tests/testdata/test/short-pass-jobs-flag-warning.out b/tests/testdata/test/short-pass-jobs-flag-warning.out deleted file mode 100644 index 0d9e1fd9b5..0000000000 --- a/tests/testdata/test/short-pass-jobs-flag-warning.out +++ /dev/null @@ -1,8 +0,0 @@ -⚠️ The `--jobs` flag is deprecated and will be removed in Deno 2.0. -Use the `--parallel` flag with possibly the `DENO_JOBS` environment variable instead. -Learn more at: https://docs.deno.com/runtime/manual/basics/env_variables -Check [WILDCARD]/test/short-pass.ts -./test/short-pass.ts => test ... ok ([WILDCARD]) - -ok | 1 passed | 0 failed ([WILDCARD]) - diff --git a/tools/lint.js b/tools/lint.js index 6ce04a657d..ef47180c26 100755 --- a/tools/lint.js +++ b/tools/lint.js @@ -225,7 +225,7 @@ async function ensureNoNewITests() { "run_tests.rs": 352, "shared_library_tests.rs": 0, "task_tests.rs": 30, - "test_tests.rs": 77, + "test_tests.rs": 75, "upgrade_tests.rs": 0, "vendor_tests.rs": 1, "watcher_tests.rs": 0,