nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 04:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[41272] - Fixed to conform to rust project style

Browse Source
This commit is contained in:
Suchith J N 2017-04-15 12:17:25 +05:30
parent 65fafd9414
commit 4ac11becc2
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librustc/hir/lowering.rs
View File

@ -2048,15 +2048,14 @@ impl<'a> LoweringContext<'a> {
// _ => [<else_opt>|()] // _ => [<else_opt>|()]
{ {
let wildcard_arm: Option<&Expr> = else_opt.as_ref().map(|p| &**p); let wildcard_arm: Option<&Expr> = else_opt.as_ref().map(|p| &**p);
let wildcard_pattern = self.pat_wild(e.span); let wildcard_pattern = self.pat_wild(e.span);
let body = let body = if let Some(else_expr) = wildcard_arm {
if let Some(else_expr) = wildcard_arm { P(self.lower_expr(else_expr))
P(self.lower_expr(else_expr)) } else {
} else { self.expr_tuple(e.span, hir_vec![])
self.expr_tuple(e.span, hir_vec![]) };
}; arms.push(self.arm(hir_vec![wildcard_pattern], body));
arms.push(self.arm(hir_vec![wildcard_pattern], body));
} }
let contains_else_clause = else_opt.is_some(); let contains_else_clause = else_opt.is_some();

10
src/test/run-pass/issue-41272.rs
View File

@ -1,3 +1,13 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
struct Foo; struct Foo;
impl Foo { impl Foo {