pacify the mercilous tidy

Author: nikomatsakis

src/librustc/infer/error_reporting.rs

@@ -327,18 +327,24 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                 }
                 SubSupConflict(ref var_origin, ref sub_origin, sub, ref sup_origin, sup) => {
                     debug!("processing SubSupConflict sub: {:?} sup: {:?}", sub, sup);
-                    if let SubregionOrigin::CompareImplMethodObligation { .. } = *sub_origin {
-                        // As above, when comparing an impl method
-                        // against a trait method, it is not helpful
-                        // to suggest changes to the impl method.
-                    } else if let SubregionOrigin::CompareImplMethodObligation { .. } = *sup_origin {
-                        // See above.
-                    } else if let Some(same_frs) = free_regions_from_same_fn(self.tcx, sub, sup) {
-                        origins.push(
-                            ProcessedErrorOrigin::VariableFailure(
-                                var_origin.clone()));
-                        append_to_same_regions(&mut same_regions, &same_frs);
-                        continue;
+                    match (sub_origin, sup_origin) {
+                        (&SubregionOrigin::CompareImplMethodObligation { .. }, _) => {
+                            // As above, when comparing an impl method
+                            // against a trait method, it is not helpful
+                            // to suggest changes to the impl method.
+                        }
+                        (_, &SubregionOrigin::CompareImplMethodObligation { .. }) => {
+                            // See above.
+                        }
+                        _ => {
+                            if let Some(same_frs) = free_regions_from_same_fn(self.tcx, sub, sup) {
+                                origins.push(
+                                    ProcessedErrorOrigin::VariableFailure(
+                                        var_origin.clone()));
+                                append_to_same_regions(&mut same_regions, &same_frs);
+                                continue;
+                            }
+                        }
                     }
                 }
                 GenericBoundFailure(ref origin, ref kind, region) => {

src/librustc_errors/diagnostic.rs

@@ -1,3 +1,13 @@
+// Copyright 2012-2015 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.
+
 use CodeSuggestion;
 use Level;
 use RenderSpan;

src/librustc_errors/diagnostic_builder.rs

@@ -1,3 +1,13 @@
+// Copyright 2012-2015 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.
+
 use Diagnostic;
 use Level;
 use Handler;