Skip to content

Commit b539764

Browse files
committed
update FIXME(rust-lang#6393) to point to RFC 811
1 parent 544ec68 commit b539764

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/libcore/iter/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1836,7 +1836,7 @@ impl<I: Iterator> Iterator for Peekable<I> {
18361836

18371837
#[inline]
18381838
fn nth(&mut self, n: usize) -> Option<I::Item> {
1839-
// FIXME(#6393): merge these when borrow-checking gets better.
1839+
// FIXME(RFC 811): merge these when borrow-checking gets better.
18401840
if n == 0 {
18411841
match self.peeked.take() {
18421842
Some(v) => v,

src/librustc_data_structures/obligation_forest/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ impl<O: ForestObligation> ObligationForest<O> {
416416
}
417417

418418
loop {
419-
// non-standard `while let` to bypass #6393
419+
// non-standard `while let` to bypass RFC 811
420420
let i = match error_stack.pop() {
421421
Some(i) => i,
422422
None => break

src/librustc_mir/util/elaborate_drops.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
176176
});
177177
}
178178
DropStyle::Conditional => {
179-
let unwind = self.unwind; // FIXME(#6393)
179+
let unwind = self.unwind; // FIXME(RFC 811)
180180
let succ = self.succ;
181181
let drop_bb = self.complete_drop(Some(DropFlagMode::Deep), succ, unwind);
182182
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(RFC 811)
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(RFC 811)
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(RFC 811)
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(RFC 811)
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(RFC 811)
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(RFC 811)
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)