Skip to content

Commit 1f5571a

Browse files
committed
auto merge of #13122 : sstewartgallus/rust/cleanup-10734-workarounds, r=alexcrichton
Cleanup old issue references. One of these workarounds no longer need to be used anymore and the others are out of date.
2 parents 5d5634a + ff2f2e8 commit 1f5571a

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/libnum/bigint.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -406,22 +406,22 @@ impl Integer for BigUint {
406406
let mut d0 = d0;
407407
let mut prod = b * d0;
408408
while prod > m {
409-
// FIXME(#6050): overloaded operators force moves with generic types
409+
// FIXME(#5992): assignment operator overloads
410410
// d0 -= d_unit
411411
d0 = d0 - d_unit;
412-
// FIXME(#6050): overloaded operators force moves with generic types
413-
// prod = prod - b_unit;
412+
// FIXME(#5992): assignment operator overloads
413+
// prod -= b_unit;
414414
prod = prod - b_unit
415415
}
416416
if d0.is_zero() {
417417
n = 2;
418418
continue;
419419
}
420420
n = 1;
421-
// FIXME(#6102): Assignment operator for BigInt causes ICE
421+
// FIXME(#5992): assignment operator overloads
422422
// d += d0;
423423
d = d + d0;
424-
// FIXME(#6102): Assignment operator for BigInt causes ICE
424+
// FIXME(#5992): assignment operator overloads
425425
// m -= prod;
426426
m = m - prod;
427427
}
@@ -724,8 +724,7 @@ impl BigUint {
724724
let d: Option<BigUint> = FromPrimitive::from_uint(d);
725725
match d {
726726
Some(d) => {
727-
// FIXME(#6102): Assignment operator for BigInt
728-
// causes ICE:
727+
// FIXME(#5992): assignment operator overloads
729728
// n += d * power;
730729
n = n + d * power;
731730
}
@@ -738,7 +737,7 @@ impl BigUint {
738737
return Some(n);
739738
}
740739
end -= unit_len;
741-
// FIXME(#6050): overloaded operators force moves with generic types
740+
// FIXME(#5992): assignment operator overloads
742741
// power *= base_num;
743742
power = power * base_num;
744743
}
@@ -2068,7 +2067,7 @@ mod biguint_tests {
20682067
fn factor(n: uint) -> BigUint {
20692068
let mut f: BigUint = One::one();
20702069
for i in range(2, n + 1) {
2071-
// FIXME(#6102): Assignment operator for BigInt causes ICE
2070+
// FIXME(#5992): assignment operator overloads
20722071
// f *= FromPrimitive::from_uint(i);
20732072
f = f * FromPrimitive::from_uint(i).unwrap();
20742073
}

src/libnum/rational.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ impl<T: Clone + Integer + Ord>
8787
fn reduce(&mut self) {
8888
let g : T = self.numer.gcd(&self.denom);
8989

90-
// FIXME(#6050): overloaded operators force moves with generic types
90+
// FIXME(#5992): assignment operator overloads
9191
// self.numer /= g;
9292
self.numer = self.numer / g;
93-
// FIXME(#6050): overloaded operators force moves with generic types
93+
// FIXME(#5992): assignment operator overloads
9494
// self.denom /= g;
9595
self.denom = self.denom / g;
9696

src/librustc/back/archive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl<'a> Archive<'a> {
9191
pub fn read(&self, file: &str) -> Vec<u8> {
9292
// Apparently if "ar p" is used on windows, it generates a corrupt file
9393
// which has bad headers and LLVM will immediately choke on it
94-
if cfg!(windows) && cfg!(windows) { // FIXME(#10734) double-and
94+
if cfg!(windows) {
9595
let loc = TempDir::new("rsar").unwrap();
9696
let archive = os::make_absolute(&self.dst);
9797
run_ar(self.sess, "x", Some(loc.path()), [&archive,

0 commit comments

Comments
 (0)