Remove arg_matrix.rs, bless tests

Author: compiler-errors

compiler/rustc_typeck/src/check/fn_ctxt/arg_matrix.rs

@@ -1,6 +1,5 @@
 use crate::astconv::AstConv;
 use crate::check::coercion::CoerceMany;
-use crate::check::fn_ctxt::arg_matrix::{ArgMatrix, Compatibility, Error};
 use crate::check::gather_locals::Declaration;
 use crate::check::method::MethodCallee;
 use crate::check::Expectation::*;
@@ -18,13 +17,9 @@ use rustc_hir as hir;
 use rustc_hir::def::{CtorOf, DefKind, Res};
 use rustc_hir::def_id::DefId;
 use rustc_hir::{ExprKind, Node, QPath};
-use rustc_infer::infer::error_reporting::{FailureCode, ObligationCauseExt};
-use rustc_infer::infer::InferOk;
-use rustc_infer::infer::TypeTrace;
 use rustc_middle::ty::adjustment::AllowTwoPhase;
-use rustc_middle::ty::error::TypeError;
 use rustc_middle::ty::fold::TypeFoldable;
-use rustc_middle::ty::{self, Ty, TyCtxt};
+use rustc_middle::ty::{self, Ty};
 use rustc_session::Session;
 use rustc_span::symbol::Ident;
 use rustc_span::{self, Span};

compiler/rustc_typeck/src/check/fn_ctxt/checks.rs

@@ -1,5 +1,4 @@
 mod _impl;
-mod arg_matrix;
 mod checks;
 mod suggestions;
 

compiler/rustc_typeck/src/check/fn_ctxt/mod.rs

@@ -20,8 +20,11 @@ fn main() {
     invalid(1.0); //~ ERROR mismatched types
     extra(""); //~ ERROR this function takes
     missing(); //~ ERROR this function takes
-    swapped("", 1); //~ ERROR arguments to this function are incorrect
-    permuted(Y {}, Z {}, X {}); //~ ERROR arguments to this function are incorrect
+    swapped("", 1); //~ ERROR mismatched types
+    //~^ ERROR mismatched types
+    permuted(Y {}, Z {}, X {}); //~ ERROR mismatched types
+    //~^ ERROR mismatched types
+    //~| ERROR mismatched types
 
     let closure = |x| x;
     closure(); //~ ERROR this function takes