diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs index 3e3aea0256e7..224f2a3f8c91 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 cade67a44bb0..3acaed6ca480 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 000000000000..1d83b3b1b8f3 --- /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 or the MIT license +// , 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