Fix rustfmt compile errors

Author: maxcabrajac

src/tools/rustfmt/src/items.rs

@@ -3449,7 +3449,7 @@ impl Rewrite for ast::ForeignItem {
                     ref generics,
                     ref body,
                 } = **fn_kind;
-                if let Some(ref body) = body {
+                if body.is_some() {
                     let mut visitor = FmtVisitor::from_context(context);
                     visitor.block_indent = shape.indent;
                     visitor.last_pos = self.span.lo();
@@ -3458,11 +3458,11 @@ impl Rewrite for ast::ForeignItem {
                     visitor.visit_fn(
                         visit::FnKind::Fn(
                             fn_ctxt,
-                            self.ident,
+                            &self.ident,
                             sig,
                             &self.vis,
                             generics,
-                            Some(body),
+                            body,
                         ),
                         &sig.decl,
                         self.span,

src/tools/rustfmt/src/visitor.rs

@@ -390,7 +390,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                 block = b;
                 self.rewrite_fn_before_block(
                     indent,
-                    ident,
+                    *ident,
                     &FnSig::from_fn_kind(&fk, fd, defaultness),
                     mk_sp(s.lo(), b.span.lo()),
                 )
@@ -540,7 +540,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                         ref generics,
                         ref body,
                     } = **fn_kind;
-                    if let Some(ref body) = body {
+                    if body.is_some() {
                         let inner_attrs = inner_attributes(&item.attrs);
                         let fn_ctxt = match sig.header.ext {
                             ast::Extern::None => visit::FnCtxt::Free,
@@ -549,11 +549,11 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                         self.visit_fn(
                             visit::FnKind::Fn(
                                 fn_ctxt,
-                                item.ident,
+                                &item.ident,
                                 sig,
                                 &item.vis,
                                 generics,
-                                Some(body),
+                                body,
                             ),
                             &sig.decl,
                             item.span,
@@ -648,11 +648,11 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                     ref generics,
                     ref body,
                 } = **fn_kind;
-                if let Some(ref body) = body {
+                if body.is_some() {
                     let inner_attrs = inner_attributes(&ai.attrs);
                     let fn_ctxt = visit::FnCtxt::Assoc(assoc_ctxt);
                     self.visit_fn(
-                        visit::FnKind::Fn(fn_ctxt, ai.ident, sig, &ai.vis, generics, Some(body)),
+                        visit::FnKind::Fn(fn_ctxt, &ai.ident, sig, &ai.vis, generics, body),
                         &sig.decl,
                         ai.span,
                         defaultness,