From 4089d140e00560cab90b7a641cb6f9923790bad8 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 12 Dec 2017 07:52:25 -0500
Subject: [PATCH] move nice-region-error reporting into its own module

---
 src/librustc/infer/error_reporting/mod.rs          |  5 +----
 .../{ => nice_region_error}/different_lifetimes.rs |  2 +-
 .../infer/error_reporting/nice_region_error/mod.rs | 14 ++++++++++++++
 .../{ => nice_region_error}/named_anon_conflict.rs |  0
 .../{ => nice_region_error}/util.rs                |  0
 5 files changed, 16 insertions(+), 5 deletions(-)
 rename src/librustc/infer/error_reporting/{ => nice_region_error}/different_lifetimes.rs (99%)
 create mode 100644 src/librustc/infer/error_reporting/nice_region_error/mod.rs
 rename src/librustc/infer/error_reporting/{ => nice_region_error}/named_anon_conflict.rs (100%)
 rename src/librustc/infer/error_reporting/{ => nice_region_error}/util.rs (100%)

diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs
index 3e3aea0256e..224f2a3f8c9 100644
--- a/src/librustc/infer/error_reporting/mod.rs
+++ b/src/librustc/infer/error_reporting/mod.rs
@@ -78,10 +78,7 @@ mod note;
 
 mod need_type_info;
 
-mod named_anon_conflict;
-#[macro_use]
-mod util;
-mod different_lifetimes;
+mod nice_region_error;
 
 impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
     pub fn note_and_explain_region(self,
diff --git a/src/librustc/infer/error_reporting/different_lifetimes.rs b/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs
similarity index 99%
rename from src/librustc/infer/error_reporting/different_lifetimes.rs
rename to src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs
index cade67a44bb..3acaed6ca48 100644
--- a/src/librustc/infer/error_reporting/different_lifetimes.rs
+++ b/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs
@@ -18,7 +18,7 @@ use infer::lexical_region_resolve::RegionResolutionError;
 use hir::map as hir_map;
 use middle::resolve_lifetime as rl;
 use hir::intravisit::{self, Visitor, NestedVisitorMap};
-use infer::error_reporting::util::AnonymousArgInfo;
+use infer::error_reporting::nice_region_error::util::AnonymousArgInfo;
 
 impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
     /// Print the error message for lifetime errors when both the concerned regions are anonymous.
diff --git a/src/librustc/infer/error_reporting/nice_region_error/mod.rs b/src/librustc/infer/error_reporting/nice_region_error/mod.rs
new file mode 100644
index 00000000000..1d83b3b1b8f
--- /dev/null
+++ b/src/librustc/infer/error_reporting/nice_region_error/mod.rs
@@ -0,0 +1,14 @@
+// Copyright 2012-2013 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.
+
+#[macro_use] mod util;
+
+mod different_lifetimes;
+mod named_anon_conflict;
diff --git a/src/librustc/infer/error_reporting/named_anon_conflict.rs b/src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs
similarity index 100%
rename from src/librustc/infer/error_reporting/named_anon_conflict.rs
rename to src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs
diff --git a/src/librustc/infer/error_reporting/util.rs b/src/librustc/infer/error_reporting/nice_region_error/util.rs
similarity index 100%
rename from src/librustc/infer/error_reporting/util.rs
rename to src/librustc/infer/error_reporting/nice_region_error/util.rs