Skip to content

Commit 7278e37

Browse files
committed
update FIXME(rust-lang#6393) to point to issue 43234 (tracking issue for non-lexical lifetimes)
1 parent 61b6bf5 commit 7278e37

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/libcore/iter/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,7 @@ impl<I: Iterator> Iterator for Peekable<I> {
18721872

18731873
#[inline]
18741874
fn nth(&mut self, n: usize) -> Option<I::Item> {
1875-
// FIXME(#6393): merge these when borrow-checking gets better.
1875+
// FIXME(#43234): merge these when borrow-checking gets better.
18761876
if n == 0 {
18771877
match self.peeked.take() {
18781878
Some(v) => v,

src/librustc_mir/util/elaborate_drops.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
177177
});
178178
}
179179
DropStyle::Conditional => {
180-
let unwind = self.unwind; // FIXME(#6393)
180+
let unwind = self.unwind; // FIXME(#43234)
181181
let succ = self.succ;
182182
let drop_bb = self.complete_drop(Some(DropFlagMode::Deep), succ, unwind);
183183
self.elaborator.patch().patch_terminator(bb, TerminatorKind::Goto {
@@ -268,7 +268,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
268268
// Clear the "master" drop flag at the end. This is needed
269269
// because the "master" drop protects the ADT's discriminant,
270270
// which is invalidated after the ADT is dropped.
271-
let (succ, unwind) = (self.succ, self.unwind); // FIXME(#6393)
271+
let (succ, unwind) = (self.succ, self.unwind); // FIXME(#43234)
272272
(
273273
self.drop_flag_reset_block(DropFlagMode::Shallow, succ, unwind),
274274
unwind.map(|unwind| {
@@ -344,7 +344,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
344344
let interior = self.place.clone().deref();
345345
let interior_path = self.elaborator.deref_subpath(self.path);
346346

347-
let succ = self.succ; // FIXME(#6393)
347+
let succ = self.succ; // FIXME(#43234)
348348
let unwind = self.unwind;
349349
let succ = self.box_free_block(ty, succ, unwind);
350350
let unwind_succ = self.unwind.map(|unwind| {
@@ -717,7 +717,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
717717
ptr_based)
718718
});
719719

720-
let succ = self.succ; // FIXME(#6393)
720+
let succ = self.succ; // FIXME(#43234)
721721
let loop_block = self.drop_loop(
722722
succ,
723723
cur,
@@ -798,7 +798,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
798798
self.open_drop_for_adt(def, substs)
799799
}
800800
ty::TyDynamic(..) => {
801-
let unwind = self.unwind; // FIXME(#6393)
801+
let unwind = self.unwind; // FIXME(#43234)
802802
let succ = self.succ;
803803
self.complete_drop(Some(DropFlagMode::Deep), succ, unwind)
804804
}
@@ -849,7 +849,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
849849

850850
fn elaborated_drop_block<'a>(&mut self) -> BasicBlock {
851851
debug!("elaborated_drop_block({:?})", self);
852-
let unwind = self.unwind; // FIXME(#6393)
852+
let unwind = self.unwind; // FIXME(#43234)
853853
let succ = self.succ;
854854
let blk = self.drop_block(succ, unwind);
855855
self.elaborate_drop(blk);
@@ -882,7 +882,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
882882
args: vec![Operand::Move(self.place.clone())],
883883
destination: Some((unit_temp, target)),
884884
cleanup: None
885-
}; // FIXME(#6393)
885+
}; // FIXME(#43234)
886886
let free_block = self.new_block(unwind, call);
887887

888888
let block_start = Location { block: free_block, statement_index: 0 };

0 commit comments

Comments
 (0)