summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2018-05-22 16:48:43 +0200
committerFelix S. Klock II <pnkfelix@pnkfx.org>2018-05-29 23:02:40 +0200
commit2f7f7ac14ef6537e266983449fbd63b163b8560e (patch)
treed446583772214de5ad57fdc4e8d02fac3fd64e97
parentReview feedback: Remove a fixme/tbd note and just add a note for the post-NLL... (diff)
downloadgrust-2f7f7ac14ef6537e266983449fbd63b163b8560e.tar.gz
grust-2f7f7ac14ef6537e266983449fbd63b163b8560e.tar.bz2
grust-2f7f7ac14ef6537e266983449fbd63b163b8560e.tar.xz
Review feedback, remove fixme comment.
-rw-r--r--src/librustc_mir/build/matches/mod.rs17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/librustc_mir/build/matches/mod.rs b/src/librustc_mir/build/matches/mod.rs
index 7555827ff0..a3c7bcfbd0 100644
--- a/src/librustc_mir/build/matches/mod.rs
+++ b/src/librustc_mir/build/matches/mod.rs
@@ -131,23 +131,6 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
131 // This should ensure that you cannot change 131 // This should ensure that you cannot change
132 // the variant for an enum while you are in 132 // the variant for an enum while you are in
133 // the midst of matching on it. 133 // the midst of matching on it.
134 //
135 // FIXME: I originally had put this at the
136 // start of each elem of arm_blocks (see
137 // ArmBlocks construction above). But this was
138 // broken; for example, when you had a trivial
139 // match like `match "foo".to_string() { _s =>
140 // {} }`, it would inject a ReadForMatch
141 // *after* the move of the input into `_s`,
142 // and that then does not pass the borrow
143 // check.
144 //
145 // * So: I need to fine tune exactly *where*
146 // the ReadForMatch belongs. Should it come
147 // at the beginning of each pattern match,
148 // or the end? And, should there be one
149 // ReadForMatch per arm, or one per
150 // candidate (aka pattern)?
151 134
152 self.cfg.push(*pre_binding_block, Statement { 135 self.cfg.push(*pre_binding_block, Statement {
153 source_info, 136 source_info,