about summary refs log tree commit diff
path: root/src/librustc_errors
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2019-03-28 20:03:13 -0700
committerEsteban Küber <esteban@kuber.com.ar>2019-03-28 20:03:13 -0700
commite13e9a5d636116455aab6940d27bbc1b450aa003 (patch)
tree64645d8501617a488ba95c2a6a99a31d9e015f05 /src/librustc_errors
parent326ec800b952749d0afc90be0604dc0332d70324 (diff)
downloadrust-e13e9a5d636116455aab6940d27bbc1b450aa003.tar.gz
rust-e13e9a5d636116455aab6940d27bbc1b450aa003.zip
review comments
Diffstat (limited to 'src/librustc_errors')
-rw-r--r--src/librustc_errors/emitter.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index c3ee1db8d30..d2c9db2db79 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -243,7 +243,7 @@ impl EmitterWriter {
                         end_col: hi.col_display,
                         is_primary: span_label.is_primary,
                         label: span_label.label.clone(),
-                        overlaps: false,
+                        overlaps_exactly: false,
                     };
                     multiline_annotations.push((lo.file.clone(), ml.clone()));
                     AnnotationType::Multiline(ml)
@@ -277,7 +277,7 @@ impl EmitterWriter {
                 {
                     a.increase_depth();
                 } else if ann.same_span(a) && &ann != a {
-                    a.overlaps = true;
+                    a.overlaps_exactly = true;
                 } else {
                     break;
                 }
@@ -290,7 +290,7 @@ impl EmitterWriter {
                 max_depth = ann.depth;
             }
             let mut end_ann = ann.as_end();
-            if !ann.overlaps {
+            if !ann.overlaps_exactly {
                 // avoid output like
                 //
                 //  |        foo(