Skip to content

Fixing straightforward configuration snippets (Part 2) #2395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jan 29, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 94 additions & 71 deletions Configurations.md
Original file line number Diff line number Diff line change
Expand Up @@ -1161,37 +1161,40 @@ 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) => ...,
})

match lorem {
None => if ipsum {
println!("Hello World");
},
Some(dolor) => ...,
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(),
}
}
```

#### `true`:

```rust
fn main() {
result.and_then(|maybe_value| {
match maybe_value {
None => foo(),
Some(value) => bar(),
}
});

result.and_then(|maybe_value| {
match maybe_value {
None => ...,
Some(value) => ...,
}
})

match lorem {
None => {
if ipsum {
println!("Hello World");
match lorem {
None => {
if ipsum {
println!("Hello World");
}
}
Some(dolor) => foo(),
}
Some(dolor) => ...,
}
```

Expand Down Expand Up @@ -1589,24 +1592,28 @@ fn lorem<T: Eq>(t: T) {
}

// non-empty square brackets
let lorem: [usize; 2] = [ipsum, dolor];
fn lorem<T: Eq>(t: T) {
let lorem: [usize; 2] = [ipsum, dolor];
}
```

#### `true`:

```rust
// generic arguments
fn lorem< T: Eq >(t: T) {
fn lorem< T: Eq >( t: T ) {
// body
}

// non-empty parentheses
fn lorem<T: Eq>( 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`
Expand All @@ -1626,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).
Expand All @@ -1649,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.",
];
}
```
Expand All @@ -1660,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.",
];
}
```
Expand All @@ -1679,43 +1688,49 @@ 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"`:

```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"`:

```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).
Expand Down Expand Up @@ -1754,15 +1769,15 @@ Determines if `+` or `=` are wrapped in spaces in the punctuation of types

```rust
fn lorem<Ipsum: Dolor + Sit = Amet>() {
// body
// body
}
```

#### `"Compressed"`:

```rust
fn lorem<Ipsum: Dolor+Sit=Amet>() {
// body
// body
}
```

Expand All @@ -1777,13 +1792,17 @@ 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`:

```rust
let lorem = ipsum.map(|dolor| dolor.sit())?;
fn main() {
let lorem = ipsum.map(|dolor| dolor.sit())?;
}
```


Expand Down Expand Up @@ -1822,21 +1841,25 @@ 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),
}
```

#### `false`:

```rust
match lorem {
true =>
foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(x),
false => println!("{}", sit),
fn main() {
match lorem {
true =>
foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(x),
false => println!("{}", sit),
}
}
```

Expand Down