From 6126d0dd545b815a7170a37d33d2602218f140b5 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Mon, 23 Oct 2023 13:13:10 -0400 Subject: [PATCH 1/2] Remove experimental formatter warning --- crates/ruff_cli/src/lib.rs | 2 -- crates/ruff_cli/tests/format.rs | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/crates/ruff_cli/src/lib.rs b/crates/ruff_cli/src/lib.rs index 75c0041b81cb6..4056315d67ca9 100644 --- a/crates/ruff_cli/src/lib.rs +++ b/crates/ruff_cli/src/lib.rs @@ -172,8 +172,6 @@ pub fn run( } fn format(args: FormatCommand, log_level: LogLevel) -> Result { - warn_user_once!("`ruff format` is not yet stable, and subject to change in future versions."); - let (cli, overrides) = args.partition(); if is_stdin(&cli.files, cli.stdin_filename.as_deref()) { diff --git a/crates/ruff_cli/tests/format.rs b/crates/ruff_cli/tests/format.rs index e9a1c9109169f..4892896f7b7de 100644 --- a/crates/ruff_cli/tests/format.rs +++ b/crates/ruff_cli/tests/format.rs @@ -40,7 +40,6 @@ if condition: print('Hy "Micha"') # Should not change quotes ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. "###); } @@ -89,7 +88,6 @@ if condition: print('Should change quotes') ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. "###); Ok(()) } @@ -117,7 +115,6 @@ fn mixed_line_endings() -> Result<()> { ----- stdout ----- ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. 2 files left unchanged "###); Ok(()) @@ -187,7 +184,6 @@ OTHER = "OTHER" 2 files would be reformatted ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. "###); Ok(()) } @@ -221,7 +217,6 @@ if __name__ == '__main__': ----- stdout ----- ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. "###); Ok(()) } @@ -278,7 +273,6 @@ if condition: print('Should change quotes') ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. warning: The following rules may cause conflicts when used with the formatter: 'Q000'. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration. "###); Ok(()) @@ -360,7 +354,6 @@ def say_hy(name: str): 1 file reformatted ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. warning: The following rules may cause conflicts when used with the formatter: 'COM812', 'COM819', 'D206', 'E501', 'ISC001', 'Q000', 'Q001', 'Q002', 'Q003', 'W191'. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration. warning: The following isort options may cause conflicts when used with the formatter: 'isort.force-single-line', 'isort.force-wrap-aliases', 'isort.lines-after-imports', 'isort.lines_between_types'. To avoid unexpected behavior, we recommend disabling these options by removing them from the configuration. "###); @@ -400,7 +393,6 @@ def say_hy(name: str): print(f"Hy {name}") ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. warning: The following rules may cause conflicts when used with the formatter: 'COM812', 'COM819', 'D206', 'E501', 'ISC001', 'Q000', 'Q001', 'Q002', 'Q003', 'W191'. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration. warning: The following isort options may cause conflicts when used with the formatter: 'isort.force-single-line', 'isort.force-wrap-aliases', 'isort.lines-after-imports', 'isort.lines_between_types'. To avoid unexpected behavior, we recommend disabling these options by removing them from the configuration. "###); @@ -443,7 +435,6 @@ fn test_diff() { z = 3 ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. 2 files would be reformatted, 1 file left unchanged "###); }); @@ -473,7 +464,6 @@ fn test_diff_no_change() { z = 3 ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. 1 file would be reformatted "### ); @@ -507,7 +497,6 @@ fn test_diff_stdin_unformatted() { z = 3 ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. "###); } @@ -524,6 +513,5 @@ fn test_diff_stdin_formatted() { ----- stdout ----- ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. "###); } From a1a6a81fe59b34c60557152cf5715799ce2e96fb Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Tue, 24 Oct 2023 10:17:27 +0900 Subject: [PATCH 2/2] Fix test failure --- crates/ruff_cli/src/commands/format.rs | 2 +- crates/ruff_cli/tests/integration_test.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/ruff_cli/src/commands/format.rs b/crates/ruff_cli/src/commands/format.rs index 1094732842c35..8b43fb56af148 100644 --- a/crates/ruff_cli/src/commands/format.rs +++ b/crates/ruff_cli/src/commands/format.rs @@ -437,7 +437,7 @@ pub(crate) enum FormatResult { /// The file was unchanged, as the formatted contents matched the existing contents. Unchanged, - /// Skipped formatting because its an unformatted file format + /// Skipped formatting because its an unsupported file format Skipped, } diff --git a/crates/ruff_cli/tests/integration_test.rs b/crates/ruff_cli/tests/integration_test.rs index d6b7b712b95ba..9fc02e9569a97 100644 --- a/crates/ruff_cli/tests/integration_test.rs +++ b/crates/ruff_cli/tests/integration_test.rs @@ -485,7 +485,6 @@ fn stdin_format_jupyter() { } ----- stderr ----- - warning: `ruff format` is not yet stable, and subject to change in future versions. "###); }