From f624f6b5a6e4b5955a958975897c029afe50ff7f Mon Sep 17 00:00:00 2001 From: David Alber Date: Wed, 17 Jan 2018 21:32:47 -0800 Subject: [PATCH 01/16] Fixing `force_multiline_blocks=false` snippet --- Configurations.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Configurations.md b/Configurations.md index 5334ca6e4c28..f001ecf1cd41 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1161,16 +1161,18 @@ Force multiline closure and match arm bodies to be wrapped in a block #### `false` (default): ```rust -result.and_then(|maybe_value| match maybe_value { - None => ..., - Some(value) => ..., -}) +fn main() { + result.and_then(|maybe_value| match maybe_value { + None => foo(), + Some(value) => bar(), + }); -match lorem { - None => if ipsum { - println!("Hello World"); - }, - Some(dolor) => ..., + match lorem { + None => if ipsum { + println!("Hello World"); + }, + Some(dolor) => foo(), + } } ``` From 8d0497bf83683df6a3a6c470a8bfaf9b86385046 Mon Sep 17 00:00:00 2001 From: David Alber Date: Wed, 17 Jan 2018 21:37:41 -0800 Subject: [PATCH 02/16] Fixing `force_multiline_blocks=true` snippet --- Configurations.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Configurations.md b/Configurations.md index f001ecf1cd41..3baf457d8401 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1179,21 +1179,22 @@ fn main() { #### `true`: ```rust - -result.and_then(|maybe_value| { - match maybe_value { - None => ..., - Some(value) => ..., - } -}) - -match lorem { - None => { - if ipsum { - println!("Hello World"); +fn main() { + result.and_then(|maybe_value| { + match maybe_value { + None => foo(), + Some(value) => bar(), } + }); + + match lorem { + None => { + if ipsum { + println!("Hello World"); + } + } + Some(dolor) => foo(), } - Some(dolor) => ..., } ``` From 9a9bb8564b7cc75c7c7c151e26294147a694626b Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 21:51:23 -0800 Subject: [PATCH 03/16] Fixing `spaces_within_parens_and_brackets=false` snippet --- Configurations.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configurations.md b/Configurations.md index 3baf457d8401..8f5ae7f517cc 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1592,7 +1592,9 @@ fn lorem(t: T) { } // non-empty square brackets -let lorem: [usize; 2] = [ipsum, dolor]; +fn lorem(t: T) { + let lorem: [usize; 2] = [ipsum, dolor]; +} ``` #### `true`: From 33b5c3f9d55ad057657ecb21b3b5ea16d00258d3 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:09:07 -0800 Subject: [PATCH 04/16] Fixing `spaces_within_parens_and_brackets=true` snippet --- Configurations.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Configurations.md b/Configurations.md index 8f5ae7f517cc..17fea0d4cd8c 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1601,17 +1601,19 @@ fn lorem(t: T) { ```rust // generic arguments -fn lorem< T: Eq >(t: T) { +fn lorem< T: Eq >( t: T ) { // body } // non-empty parentheses -fn lorem( t: T ) { +fn lorem< T: Eq >( t: T ) { let lorem = ( ipsum, dolor ); } // non-empty square brackets -let lorem: [ usize; 2 ] = [ ipsum, dolor ]; +fn lorem< T: Eq >( t: T ) { + let lorem: [ usize; 2 ] = [ ipsum, dolor ]; +} ``` ## `struct_lit_single_line` From fdd126a36e5314c8f3fb4389d238b3e15015846d Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:20:56 -0800 Subject: [PATCH 05/16] Wrapping `struct_lit_single_line=false` snippet in function --- Configurations.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Configurations.md b/Configurations.md index 17fea0d4cd8c..a1047d3a11b9 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1633,10 +1633,12 @@ let lorem = Lorem { ipsum: dolor, sit: amet }; #### `false`: ```rust -let lorem = Lorem { - ipsum: dolor, - sit: amet, -}; +fn main() { + let lorem = Lorem { + ipsum: dolor, + sit: amet, + }; +} ``` See also: [`indent_style`](#indent_style). From e5cdf0e9fd4ee69fb5d0475c1437cc9e8a619f40 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:33:11 -0800 Subject: [PATCH 06/16] Fixing `tab_spaces=4` snippet --- Configurations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations.md b/Configurations.md index a1047d3a11b9..8d2b9e72bc50 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1658,7 +1658,7 @@ Number of spaces per tab fn lorem() { let ipsum = dolor(); let sit = vec![ - "amet consectetur adipiscing elit." + "amet consectetur adipiscing elit amet consectetur adipiscing elit amet consectetur.", ]; } ``` From 9d696a94e603a8f2c3951f76c95442f0220fab45 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:33:42 -0800 Subject: [PATCH 07/16] Fixing `tab_spaces=2` snippet --- Configurations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations.md b/Configurations.md index 8d2b9e72bc50..04b1143aa6ca 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1669,7 +1669,7 @@ fn lorem() { fn lorem() { let ipsum = dolor(); let sit = vec![ - "amet consectetur adipiscing elit." + "amet consectetur adipiscing elit amet consectetur adipiscing elit amet consectetur.", ]; } ``` From 99ae6b8d1f117e1b143ea0dc46fb926846c39000 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:36:12 -0800 Subject: [PATCH 08/16] Wrapping `trailing_comma=Vertical` snippet in function --- Configurations.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Configurations.md b/Configurations.md index 04b1143aa6ca..3982541c80f1 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1688,15 +1688,17 @@ How to handle trailing commas for lists #### `"Vertical"` (default): ```rust -let Lorem { ipsum, dolor, sit } = amet; -let Lorem { - ipsum, - dolor, - sit, - amet, - consectetur, - adipiscing, -} = elit; +fn main() { + let Lorem { ipsum, dolor, sit } = amet; + let Lorem { + ipsum, + dolor, + sit, + amet, + consectetur, + adipiscing, + } = elit; +} ``` #### `"Always"`: From 6c92808060c5ade1bbef566d99edde683a931c59 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:37:58 -0800 Subject: [PATCH 09/16] Wrapping `trailing_comma=Always` snippet in function --- Configurations.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Configurations.md b/Configurations.md index 3982541c80f1..8a7cb1e7ebc8 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1704,15 +1704,17 @@ fn main() { #### `"Always"`: ```rust -let Lorem { ipsum, dolor, sit, } = amet; -let Lorem { - ipsum, - dolor, - sit, - amet, - consectetur, - adipiscing, -} = elit; +fn main() { + let Lorem { ipsum, dolor, sit, } = amet; + let Lorem { + ipsum, + dolor, + sit, + amet, + consectetur, + adipiscing, + } = elit; +} ``` #### `"Never"`: From 61630bc6f583fcb81d43bac2fcee30dd166b945c Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:39:27 -0800 Subject: [PATCH 10/16] Wrapping `trailing_comma=Never` snippet in function --- Configurations.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Configurations.md b/Configurations.md index 8a7cb1e7ebc8..cbc034a8b018 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1720,15 +1720,17 @@ fn main() { #### `"Never"`: ```rust -let Lorem { ipsum, dolor, sit } = amet; -let Lorem { - ipsum, - dolor, - sit, - amet, - consectetur, - adipiscing -} = elit; +fn main() { + let Lorem { ipsum, dolor, sit } = amet; + let Lorem { + ipsum, + dolor, + sit, + amet, + consectetur, + adipiscing + } = elit; +} ``` See also: [`match_block_trailing_comma`](#match_block_trailing_comma). From dab8f4991d03ac6531b40795d2fbafa2ae7a2967 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:44:09 -0800 Subject: [PATCH 11/16] Fixing `type_punctuation_density=Wide` snippet --- Configurations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations.md b/Configurations.md index cbc034a8b018..a152ad66aa31 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1769,7 +1769,7 @@ Determines if `+` or `=` are wrapped in spaces in the punctuation of types ```rust fn lorem() { - // body + // body } ``` From 4315e3d968a0c6bb34daf634a02b827870be2b91 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:46:30 -0800 Subject: [PATCH 12/16] Fixing `type_punctuation_density=Compressed` snippet --- Configurations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations.md b/Configurations.md index a152ad66aa31..9ee335d84353 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1777,7 +1777,7 @@ fn lorem() { ```rust fn lorem() { - // body + // body } ``` From 90c3ea716aaac55ff0855731ef53a92f9b05d922 Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:49:54 -0800 Subject: [PATCH 13/16] Fixing `use_try_shorthand=false` snippet --- Configurations.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configurations.md b/Configurations.md index 9ee335d84353..abe0f7026167 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1792,7 +1792,9 @@ Replace uses of the try! macro by the ? shorthand #### `false` (default): ```rust -let lorem = try!(ipsum.map(|dolor|dolor.sit())); +fn main() { + let lorem = try!(ipsum.map(|dolor| dolor.sit())); +} ``` #### `true`: From d27393528cf5ad00fb7032bb5bf266e72711e04d Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:51:51 -0800 Subject: [PATCH 14/16] Fixing `use_try_shorthand=true` snippet --- Configurations.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configurations.md b/Configurations.md index abe0f7026167..ff8b97057488 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1800,7 +1800,9 @@ fn main() { #### `true`: ```rust -let lorem = ipsum.map(|dolor| dolor.sit())?; +fn main() { + let lorem = ipsum.map(|dolor| dolor.sit())?; +} ``` From 42efa7cc2f5ec4d4f95095c8a0d1113cebf1b8ed Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:56:14 -0800 Subject: [PATCH 15/16] Wrapping `match_arm_blocks=true` snippet in function --- Configurations.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Configurations.md b/Configurations.md index ff8b97057488..eb8d2ae0a3d4 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1841,11 +1841,13 @@ Wrap the body of arms in blocks when it does not fit on the same line with the p #### `true` (default): ```rust -match lorem { - true => { - foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(x) +fn main() { + match lorem { + true => { + foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(x) + } + false => println!("{}", sit), } - false => println!("{}", sit), } ``` From 476ec77fa372449dc803fb0d1c37131b35f7cd8b Mon Sep 17 00:00:00 2001 From: David Alber Date: Sat, 20 Jan 2018 22:57:53 -0800 Subject: [PATCH 16/16] Wrapping `match_arm_blocks=false` snippet in function --- Configurations.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Configurations.md b/Configurations.md index eb8d2ae0a3d4..5a914a0d6103 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1854,10 +1854,12 @@ fn main() { #### `false`: ```rust -match lorem { - true => - foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(x), - false => println!("{}", sit), +fn main() { + match lorem { + true => + foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(x), + false => println!("{}", sit), + } } ```