diff options
| author | Nick Cameron <nrc@ncameron.org> | 2017-04-06 21:26:13 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 21:26:13 +1200 |
| commit | bdcb8d663e6b413e7a837cf5eeff5b8b78f722b6 (patch) | |
| tree | 156dd174962d756aa9174006ec6a5f4b00f8db29 /src | |
| parent | fa732ede8bd8fbce31209d5c6ecb7b0d3a966eb4 (diff) | |
| parent | 8d22e85e48bf46b3056b8e0173940a8bb4f69c31 (diff) | |
Merge pull request #1438 from topecongiro/poor-formatting/method-chains
Lookup the last element of 'subexpr_list' instead of the first one
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/cargo-fmt.rs | 3 | ||||
| -rw-r--r-- | src/chains.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/cargo-fmt.rs b/src/bin/cargo-fmt.rs index 0fcd0fd3f2d..ea747aa4702 100644 --- a/src/bin/cargo-fmt.rs +++ b/src/bin/cargo-fmt.rs @@ -199,7 +199,8 @@ fn get_targets(workspace_hitlist: WorkspaceHitlist) -> Result<Vec<Target>, std:: // is used inside a workspace. // To ensure backward compatability, we only use `cargo metadata` for workspaces. // TODO: Is it possible only use metadata or read-manifest - let output = Command::new("cargo").arg("metadata") + let output = Command::new("cargo") + .arg("metadata") .arg("--no-deps") .output()?; if output.status.success() { diff --git a/src/chains.rs b/src/chains.rs index 2c2b4ef63ea..0181cd3d099 100644 --- a/src/chains.rs +++ b/src/chains.rs @@ -217,7 +217,7 @@ pub fn rewrite_chain(expr: &ast::Expr, context: &RewriteContext, shape: Shape) - let first_connector = if extend || subexpr_list.is_empty() { "" - } else if let ast::ExprKind::Try(_) = subexpr_list[0].node { + } else if let ast::ExprKind::Try(_) = subexpr_list.last().unwrap().node { "" } else { &*connector |
