refactor: few minor updates

Author: calebcartwright

rustfmt-core/rustfmt-lib/src/items.rs

@@ -281,9 +281,7 @@ impl<'a> FnSig<'a> {
             visit::FnKind::Method(_, method_sig, vis, _) => {
                 let mut fn_sig = FnSig::from_method_sig(method_sig, generics);
                 fn_sig.defaultness = defaultness;
-                if let Some(vis) = vis {
-                    fn_sig.visibility = vis.clone();
-                }
+                fn_sig.visibility = vis.clone();
                 fn_sig
             }
             _ => unreachable!(),
@@ -1753,7 +1751,7 @@ impl<'a> StaticParts<'a> {
             ident: ii.ident,
             ty,
             mutability: ast::Mutability::Not,
-            expr_opt: Some(expr),
+            expr_opt: expr.as_ref(),
             defaultness: Some(ii.defaultness),
             span: ii.span,
         }

rustfmt-core/rustfmt-lib/src/patterns.rs

@@ -191,8 +191,8 @@ impl Rewrite for Pat {
                     infix.to_owned()
                 };
                 rewrite_pair(
-                    &**lhs,
-                    &**rhs,
+                    &lhs.unwrap(),
+                    &rhs.unwrap(),
                     PairParts::infix(&infix),
                     context,
                     shape,

rustfmt-core/rustfmt-lib/src/types.rs

@@ -1,7 +1,7 @@
 use std::iter::ExactSizeIterator;
 use std::ops::Deref;
 
-use rustc_span::{BytePos, DUMMY_SP, Span, symbol::kw};
+use rustc_span::{BytePos, Span, symbol::kw};
 use syntax::ast::{self, FunctionRetTy, Mutability};
 
 use crate::config::lists::*;
@@ -274,13 +274,9 @@ fn rewrite_segment(
                 result.push_str(&generics_str)
             }
             ast::GenericArgs::Parenthesized(ref data) => {
-                let output = match data.output {
-                    Some(ref ty) => FunctionRetTy::Ty(ty.clone()),
-                    None => FunctionRetTy::Default(DUMMY_SP),
-                };
                 result.push_str(&format_function_type(
                     data.inputs.iter().map(|x| &**x),
-                    &output,
+                    &data.output,
                     false,
                     data.span,
                     context,