+// rustfmt-normalize_comments: true
// Match expressions.
fn foo() {
an_expression;
foo()
}
- // Perhaps this should introduce braces?
- Foo(ref bar) =>
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+ Foo(ref bar) => {
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ }
Pattern1 | Pattern2 | Pattern3 => false,
Paternnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn |
- Paternnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn => {
- blah
- }
+ Paternnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn => blah,
Patternnnnnnnnnnnnnnnnnnn |
Patternnnnnnnnnnnnnnnnnnn |
Patternnnnnnnnnnnnnnnnnnn |
Patternnnnnnnnnnnnnnnnnnn if looooooooooooooooooong_guard => meh,
Patternnnnnnnnnnnnnnnnnnnnnnnnn |
- Patternnnnnnnnnnnnnnnnnnnnnnnnn if looooooooooooooooooooooooooooooooooooooooong_guard =>
- meh,
+ Patternnnnnnnnnnnnnnnnnnnnnnnnn if looooooooooooooooooooooooooooooooooooooooong_guard => {
+ meh
+ }
// Test that earlier patterns can take the guard space
- (aaaa,
- bbbbb,
- ccccccc,
- aaaaa,
- bbbbbbbb,
- cccccc,
- aaaa,
- bbbbbbbb,
- cccccc,
- dddddd) |
+ (aaaa, bbbbb, ccccccc, aaaaa, bbbbbbbb, cccccc, aaaa, bbbbbbbb, cccccc, dddddd) |
Patternnnnnnnnnnnnnnnnnnnnnnnnn if loooooooooooooooooooooooooooooooooooooooooong_guard => {}
_ => {}
// Test that one-line bodies align.
fn main() {
match r {
- Variableeeeeeeeeeeeeeeeee => ("variable",
- vec!["id", "name", "qualname", "value", "type", "scopeid"],
- true,
- true),
- Enummmmmmmmmmmmmmmmmmmmm => ("enum",
- vec!["id", "qualname", "scopeid", "value"],
- true,
- true),
- Variantttttttttttttttttttttttt =>
- ("variant",
- vec!["id", "name", "qualname", "type", "value", "scopeid"],
- true,
- true),
+ Variableeeeeeeeeeeeeeeeee => {
+ ("variable", vec!["id", "name", "qualname", "value", "type", "scopeid"], true, true)
+ }
+ Enummmmmmmmmmmmmmmmmmmmm => {
+ ("enum", vec!["id", "qualname", "scopeid", "value"], true, true)
+ }
+ Variantttttttttttttttttttttttt => {
+ ("variant", vec!["id", "name", "qualname", "type", "value", "scopeid"], true, true)
+ }
+ };
+
+ match x {
+ y => { /*Block with comment. Preserve me.*/ }
+ z => {
+ stmt();
+ }
}
}
}
}
+fn match_skip() {
+ let _ = match Some(1) {
+ #[rustfmt_skip]
+ Some( n ) => n,
+ None => 1,
+ };
+}
+
fn issue339() {
match a {
b => {}
match mac {
a => println!("a", b),
b => vec![1, 2],
- c => vec!(3; 4),
- d => {
- println!("a", b)
- }
- e => {
- vec![1, 2]
- }
- f => {
- vec!(3; 4)
- }
+ c => vec![3; 4],
+ d => println!("a", b),
+ e => vec![1, 2],
+ f => vec![3; 4],
h => println!("a", b), // h comment
i => vec![1, 2], // i comment
- j => vec!(3; 4), // j comment
+ j => vec![3; 4], // j comment
// k comment
k => println!("a", b),
// l comment
l => vec![1, 2],
// m comment
- m => vec!(3; 4),
+ m => vec![3; 4],
// Rewrite splits macro
- nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn =>
- println!("a", b),
+ nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn => {
+ println!("a", b)
+ }
// Rewrite splits macro
- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo =>
- vec![1, 2],
+ oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo => {
+ vec![1, 2]
+ }
// Macro support fails to recognise this macro as splitable
// We push the whole expr to a new line, TODO split this macro as well
- pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp =>
- vec!(3; 4),
+ pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp => {
+ vec![3; 4]
+ }
// q, r and s: Rewrite splits match arm
- qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq =>
- println!("a", b),
- rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr =>
- vec![1, 2],
- ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss =>
- vec!(3; 4),
+ qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq => {
+ println!("a", b)
+ }
+ rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr => {
+ vec![1, 2]
+ }
+ ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss => {
+ vec![3; 4]
+ }
// Funky bracketing styles
t => println!{"a", b},
u => vec![1, 2],
- v => vec!{3; 4},
+ v => vec![3; 4],
w => println!["a", b],
x => vec![1, 2],
y => vec![3; 4],
// Brackets with comments
tc => println!{"a", b}, // comment
uc => vec![1, 2], // comment
- vc => vec!{3; 4}, // comment
+ vc => vec![3; 4], // comment
wc => println!["a", b], // comment
xc => vec![1, 2], // comment
yc => vec![3; 4], // comment
- yd => looooooooooooooooooooooooooooooooooooooooooooooooooooooooong_func(aaaaaaaaaa,
- bbbbbbbbbb,
- cccccccccc,
- dddddddddd),
+ yd => {
+ looooooooooooooooooooooooooooooooooooooooooooooooooooooooong_func(aaaaaaaaaa,
+ bbbbbbbbbb,
+ cccccccccc,
+ dddddddddd)
+ }
}
}
fn issue280() {
{
match x {
- CompressionMode::DiscardNewline | CompressionMode::CompressWhitespaceNewline =>
- ch == '\n',
- ast::ItemConst(ref typ, ref expr) =>
- self.process_static_or_const_item(item, &typ, &expr),
+ CompressionMode::DiscardNewline |
+ CompressionMode::CompressWhitespaceNewline => ch == '\n',
+ ast::ItemConst(ref typ, ref expr) => {
+ self.process_static_or_const_item(item, &typ, &expr)
+ }
}
}
}
fn issue383() {
match resolution.last_private {
- LastImport{..} => false,
+ LastImport { .. } => false,
_ => true,
- }
+ };
}
fn issue507() {
Some(NodeTypeId::Element(_)) => false,
}
}
+
+fn issue496() {
+ {
+ {
+ {
+ match def {
+ def::DefConst(def_id) |
+ def::DefAssociatedConst(def_id) => {
+ match const_eval::lookup_const_by_id(cx.tcx, def_id, Some(self.pat.id)) {
+ Some(const_expr) => x,
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+fn issue494() {
+ {
+ match stmt.node {
+ hir::StmtExpr(ref expr, id) |
+ hir::StmtSemi(ref expr, id) => {
+ result.push(StmtRef::Mirror(Box::new(Stmt {
+ span: stmt.span,
+ kind: StmtKind::Expr {
+ scope: cx.tcx
+ .region_maps
+ .node_extent(id),
+ expr: expr.to_ref(),
+ },
+ })))
+ }
+ }
+ }
+}
+
+fn issue386() {
+ match foo {
+ BiEq | BiLt | BiLe | BiNe | BiGt | BiGe => true,
+ BiAnd | BiOr | BiAdd | BiSub | BiMul | BiDiv | BiRem | BiBitXor | BiBitAnd | BiBitOr |
+ BiShl | BiShr => false,
+ }
+}
+
+fn guards() {
+ match foo {
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa if foooooooooooooo &&
+ barrrrrrrrrrrr => {}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa if foooooooooooooo &&
+ barrrrrrrrrrrr => {}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ if fooooooooooooooooooooo &&
+ (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ||
+ cccccccccccccccccccccccccccccccccccccccc) => {}
+ }
+}
+
+fn issue1371() {
+ Some(match type_ {
+ sfEvtClosed => Closed,
+ sfEvtResized => {
+ let e = unsafe { *event.size.as_ref() };
+
+ Resized {
+ width: e.width,
+ height: e.height,
+ }
+ }
+ sfEvtLostFocus => LostFocus,
+ sfEvtGainedFocus => GainedFocus,
+ sfEvtTextEntered => {
+ TextEntered {
+ unicode:
+ unsafe {
+ ::std::char::from_u32((*event.text.as_ref()).unicode)
+ .expect("Invalid unicode encountered on TextEntered event")
+ },
+ }
+ }
+ sfEvtKeyPressed => {
+ let e = unsafe { event.key.as_ref() };
+
+ KeyPressed {
+ code: unsafe { ::std::mem::transmute(e.code) },
+ alt: e.alt.to_bool(),
+ ctrl: e.control.to_bool(),
+ shift: e.shift.to_bool(),
+ system: e.system.to_bool(),
+ }
+ }
+ sfEvtKeyReleased => {
+ let e = unsafe { event.key.as_ref() };
+
+ KeyReleased {
+ code: unsafe { ::std::mem::transmute(e.code) },
+ alt: e.alt.to_bool(),
+ ctrl: e.control.to_bool(),
+ shift: e.shift.to_bool(),
+ system: e.system.to_bool(),
+ }
+ }
+ })
+}
+
+fn issue1395() {
+ let bar = Some(true);
+ let foo = Some(true);
+ let mut x = false;
+ bar.and_then(|_| match foo {
+ None => None,
+ Some(b) => {
+ x = true;
+ Some(b)
+ }
+ });
+}
+
+fn issue1456() {
+ Ok(Recording {
+ artists: match reader
+ .evaluate(".//mb:recording/mb:artist-credit/mb:name-credit")? {
+ Nodeset(nodeset) => {
+ let res: Result<Vec<ArtistRef>, ReadError> = nodeset
+ .iter()
+ .map(|node| {
+ XPathNodeReader::new(node, &context)
+ .and_then(|r| ArtistRef::from_xml(&r))
+ })
+ .collect();
+ res?
+ }
+ _ => Vec::new(),
+ },
+ })
+}
+
+fn issue1460() {
+ let _ = match foo {
+ REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT => {
+ "internal_spec_insert_internal_spec_insert_internal_spec_insert"
+ }
+ _ => "reorder_something",
+ };
+}
+
+fn issue525() {
+ foobar(f, "{}", match *self {
+ TaskState::Started => "started",
+ TaskState::Success => "success",
+ TaskState::Failed => "failed",
+ });
+}
projects / rust.git / blobdiff