Skip to content

Commit bc9b8f2

Browse files
committed
move nice-region-error reporting into its own module
1 parent d46b42f commit bc9b8f2

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

src/librustc/infer/error_reporting/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,7 @@ mod note;
7878

7979
mod need_type_info;
8080

81-
mod named_anon_conflict;
82-
#[macro_use]
83-
mod util;
84-
mod different_lifetimes;
81+
mod nice_region_error;
8582

8683
impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
8784
pub fn note_and_explain_region(self,

src/librustc/infer/error_reporting/different_lifetimes.rs renamed to src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use infer::lexical_region_resolve::RegionResolutionError;
1818
use hir::map as hir_map;
1919
use middle::resolve_lifetime as rl;
2020
use hir::intravisit::{self, Visitor, NestedVisitorMap};
21-
use infer::error_reporting::util::AnonymousArgInfo;
21+
use infer::error_reporting::nice_region_error::util::AnonymousArgInfo;
2222

2323
impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
2424
/// Print the error message for lifetime errors when both the concerned regions are anonymous.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#[macro_use] mod util;
12+
13+
mod different_lifetimes;
14+
mod named_anon_conflict;

0 commit comments

Comments
 (0)