---

yaml
---
r: 277939
b: refs/heads/auto
c: 883b969
h: refs/heads/master
i:
  277937: d3c5513
  277935: 0b155bd

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1fdbfcdbd0a6a63317872fef24222533bbc8cfaf
+refs/heads/auto: 883b9699098e43453c0f4b9c3fd2a6fa16afcb35
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/libsyntax/codemap.rs

@@ -334,9 +334,11 @@ impl MultiSpan {
         &self.primary_spans
     }
 
-    /// Returns the strings to highlight. If we have an explicit set,
-    /// return those, otherwise just give back an (unlabeled) version
-    /// of the primary span.
+    /// Returns the strings to highlight. We always ensure that there
+    /// is an entry for each of the primary spans -- for each primary
+    /// span P, if there is at least one label with span P, we return
+    /// those labels (marked as primary). But otherwise we return
+    /// `SpanLabel` instances with empty labels.
     pub fn span_labels(&self) -> Vec<SpanLabel> {
         let is_primary = |span| self.primary_spans.contains(&span);
         let mut span_labels = vec![];