From 2e00214b3efbdfeefaa0fe9e8b8fd519de7adc35 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:50 +0200 Subject: Merging upstream version 1.69.0+dfsg1. Signed-off-by: Daniel Baumann --- .../target/configs/fn_args_layout/compressed.rs | 22 ------------ .../tests/target/configs/fn_args_layout/tall.rs | 32 ----------------- .../target/configs/fn_args_layout/vertical.rs | 42 ---------------------- .../target/configs/fn_params_layout/compressed.rs | 22 ++++++++++++ .../tests/target/configs/fn_params_layout/tall.rs | 32 +++++++++++++++++ .../target/configs/fn_params_layout/vertical.rs | 42 ++++++++++++++++++++++ 6 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 src/tools/rustfmt/tests/target/configs/fn_args_layout/compressed.rs delete mode 100644 src/tools/rustfmt/tests/target/configs/fn_args_layout/tall.rs delete mode 100644 src/tools/rustfmt/tests/target/configs/fn_args_layout/vertical.rs create mode 100644 src/tools/rustfmt/tests/target/configs/fn_params_layout/compressed.rs create mode 100644 src/tools/rustfmt/tests/target/configs/fn_params_layout/tall.rs create mode 100644 src/tools/rustfmt/tests/target/configs/fn_params_layout/vertical.rs (limited to 'src/tools/rustfmt/tests/target/configs') diff --git a/src/tools/rustfmt/tests/target/configs/fn_args_layout/compressed.rs b/src/tools/rustfmt/tests/target/configs/fn_args_layout/compressed.rs deleted file mode 100644 index f189446e2..000000000 --- a/src/tools/rustfmt/tests/target/configs/fn_args_layout/compressed.rs +++ /dev/null @@ -1,22 +0,0 @@ -// rustfmt-fn_args_layout: Compressed -// Function arguments density - -trait Lorem { - fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet); - - fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet) { - // body - } - - fn lorem( - ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet, consectetur: onsectetur, - adipiscing: Adipiscing, elit: Elit, - ); - - fn lorem( - ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet, consectetur: onsectetur, - adipiscing: Adipiscing, elit: Elit, - ) { - // body - } -} diff --git a/src/tools/rustfmt/tests/target/configs/fn_args_layout/tall.rs b/src/tools/rustfmt/tests/target/configs/fn_args_layout/tall.rs deleted file mode 100644 index 20f308973..000000000 --- a/src/tools/rustfmt/tests/target/configs/fn_args_layout/tall.rs +++ /dev/null @@ -1,32 +0,0 @@ -// rustfmt-fn_args_layout: Tall -// Function arguments density - -trait Lorem { - fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet); - - fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet) { - // body - } - - fn lorem( - ipsum: Ipsum, - dolor: Dolor, - sit: Sit, - amet: Amet, - consectetur: onsectetur, - adipiscing: Adipiscing, - elit: Elit, - ); - - fn lorem( - ipsum: Ipsum, - dolor: Dolor, - sit: Sit, - amet: Amet, - consectetur: onsectetur, - adipiscing: Adipiscing, - elit: Elit, - ) { - // body - } -} diff --git a/src/tools/rustfmt/tests/target/configs/fn_args_layout/vertical.rs b/src/tools/rustfmt/tests/target/configs/fn_args_layout/vertical.rs deleted file mode 100644 index 6c695a75d..000000000 --- a/src/tools/rustfmt/tests/target/configs/fn_args_layout/vertical.rs +++ /dev/null @@ -1,42 +0,0 @@ -// rustfmt-fn_args_layout: Vertical -// Function arguments density - -trait Lorem { - fn lorem( - ipsum: Ipsum, - dolor: Dolor, - sit: Sit, - amet: Amet, - ); - - fn lorem( - ipsum: Ipsum, - dolor: Dolor, - sit: Sit, - amet: Amet, - ) { - // body - } - - fn lorem( - ipsum: Ipsum, - dolor: Dolor, - sit: Sit, - amet: Amet, - consectetur: onsectetur, - adipiscing: Adipiscing, - elit: Elit, - ); - - fn lorem( - ipsum: Ipsum, - dolor: Dolor, - sit: Sit, - amet: Amet, - consectetur: onsectetur, - adipiscing: Adipiscing, - elit: Elit, - ) { - // body - } -} diff --git a/src/tools/rustfmt/tests/target/configs/fn_params_layout/compressed.rs b/src/tools/rustfmt/tests/target/configs/fn_params_layout/compressed.rs new file mode 100644 index 000000000..ff32f0f1d --- /dev/null +++ b/src/tools/rustfmt/tests/target/configs/fn_params_layout/compressed.rs @@ -0,0 +1,22 @@ +// rustfmt-fn_params_layout: Compressed +// Function arguments density + +trait Lorem { + fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet); + + fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet) { + // body + } + + fn lorem( + ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet, consectetur: onsectetur, + adipiscing: Adipiscing, elit: Elit, + ); + + fn lorem( + ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet, consectetur: onsectetur, + adipiscing: Adipiscing, elit: Elit, + ) { + // body + } +} diff --git a/src/tools/rustfmt/tests/target/configs/fn_params_layout/tall.rs b/src/tools/rustfmt/tests/target/configs/fn_params_layout/tall.rs new file mode 100644 index 000000000..25a86799a --- /dev/null +++ b/src/tools/rustfmt/tests/target/configs/fn_params_layout/tall.rs @@ -0,0 +1,32 @@ +// rustfmt-fn_params_layout: Tall +// Function arguments density + +trait Lorem { + fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet); + + fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet) { + // body + } + + fn lorem( + ipsum: Ipsum, + dolor: Dolor, + sit: Sit, + amet: Amet, + consectetur: onsectetur, + adipiscing: Adipiscing, + elit: Elit, + ); + + fn lorem( + ipsum: Ipsum, + dolor: Dolor, + sit: Sit, + amet: Amet, + consectetur: onsectetur, + adipiscing: Adipiscing, + elit: Elit, + ) { + // body + } +} diff --git a/src/tools/rustfmt/tests/target/configs/fn_params_layout/vertical.rs b/src/tools/rustfmt/tests/target/configs/fn_params_layout/vertical.rs new file mode 100644 index 000000000..7a0e42415 --- /dev/null +++ b/src/tools/rustfmt/tests/target/configs/fn_params_layout/vertical.rs @@ -0,0 +1,42 @@ +// rustfmt-fn_params_layout: Vertical +// Function arguments density + +trait Lorem { + fn lorem( + ipsum: Ipsum, + dolor: Dolor, + sit: Sit, + amet: Amet, + ); + + fn lorem( + ipsum: Ipsum, + dolor: Dolor, + sit: Sit, + amet: Amet, + ) { + // body + } + + fn lorem( + ipsum: Ipsum, + dolor: Dolor, + sit: Sit, + amet: Amet, + consectetur: onsectetur, + adipiscing: Adipiscing, + elit: Elit, + ); + + fn lorem( + ipsum: Ipsum, + dolor: Dolor, + sit: Sit, + amet: Amet, + consectetur: onsectetur, + adipiscing: Adipiscing, + elit: Elit, + ) { + // body + } +} -- cgit v1.2.3