about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2019-06-24 15:14:09 -0400
committerNiko Matsakis <niko@alum.mit.edu>2019-07-02 12:25:22 -0400
commit6cab003fd1d83c55068b7193d91290aef56424df (patch)
tree0043009eecb0b5831df4491734c54afb21849706
parent9588f7fe7434fa7201799d10a16ef810bf1ae2a1 (diff)
downloadrust-6cab003fd1d83c55068b7193d91290aef56424df.tar.gz
rust-6cab003fd1d83c55068b7193d91290aef56424df.zip
cleanup formatting of comment and add attribution
-rw-r--r--src/librustc/infer/lexical_region_resolve/mod.rs45
1 files changed, 23 insertions, 22 deletions
diff --git a/src/librustc/infer/lexical_region_resolve/mod.rs b/src/librustc/infer/lexical_region_resolve/mod.rs
index 3808a0014a1..d06c4434b3a 100644
--- a/src/librustc/infer/lexical_region_resolve/mod.rs
+++ b/src/librustc/infer/lexical_region_resolve/mod.rs
@@ -628,28 +628,29 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
             match *value {
                 VarValue::Value(_) => { /* Inference successful */ }
                 VarValue::ErrorValue => {
-                    /* Inference impossible: this value contains
-                    inconsistent constraints.
-
-                    I think that in this case we should report an
-                    error now -- unlike the case above, we can't
-                    wait to see whether the user needs the result
-                    of this variable. The reason is that the mere
-                    existence of this variable implies that the
-                    region graph is inconsistent, whether or not it
-                    is used.
-
-                    For example, we may have created a region
-                    variable that is the GLB of two other regions
-                    which do not have a GLB. Even if that variable
-                    is not used, it implies that those two regions
-                    *should* have a GLB.
-
-                    At least I think this is true. It may be that
-                    the mere existence of a conflict in a region variable
-                    that is not used is not a problem, so if this rule
-                    starts to create problems we'll have to revisit
-                    this portion of the code and think hard about it. =) */
+                    // Inference impossible: this value contains
+                    // inconsistent constraints.
+                    //
+                    // I think that in this case we should report an
+                    // error now -- unlike the case above, we can't
+                    // wait to see whether the user needs the result
+                    // of this variable. The reason is that the mere
+                    // existence of this variable implies that the
+                    // region graph is inconsistent, whether or not it
+                    // is used.
+                    //
+                    // For example, we may have created a region
+                    // variable that is the GLB of two other regions
+                    // which do not have a GLB. Even if that variable
+                    // is not used, it implies that those two regions
+                    // *should* have a GLB.
+                    //
+                    // At least I think this is true. It may be that
+                    // the mere existence of a conflict in a region
+                    // variable that is not used is not a problem, so
+                    // if this rule starts to create problems we'll
+                    // have to revisit this portion of the code and
+                    // think hard about it. =) -- nikomatsakis
                     self.collect_error_for_expanding_node(graph, &mut dup_vec, node_vid, errors);
                 }
             }