Skip to content

Commit ff99111

Browse files
committed
address some FIXMEs whose associated issues were marked as closed
remove FIXME(rust-lang#13101) since `assert_receiver_is_total_eq` stays. remove FIXME(rust-lang#19649) now that stability markers render. remove FIXME(rust-lang#13642) now the benchmarks were moved. remove FIXME(rust-lang#6220) now that floating points can be formatted. remove FIXME(rust-lang#18248) and write tests for `Rc<str>` and `Rc<[u8]>` remove reference to irelevent issues in FIXME(rust-lang#1697, rust-lang#2178...) update FIXME(rust-lang#5516) to point to getopts issue 7 update FIXME(rust-lang#7771) to point to RFC 628 update FIXME(rust-lang#19839) to point to issue 26925
1 parent b7041bf commit ff99111

File tree

16 files changed

+32
-28
lines changed

16 files changed

+32
-28
lines changed

src/liballoc/binary_heap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {
926926
}
927927
}
928928

929-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
929+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
930930
#[stable(feature = "rust1", since = "1.0.0")]
931931
impl<'a, T> Clone for Iter<'a, T> {
932932
fn clone(&self) -> Iter<'a, T> {

src/liballoc/linked_list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {
8080
}
8181
}
8282

83-
// FIXME #19839: deriving is too aggressive on the bounds (T doesn't need to be Clone).
83+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
8484
#[stable(feature = "rust1", since = "1.0.0")]
8585
impl<'a, T> Clone for Iter<'a, T> {
8686
fn clone(&self) -> Self {

src/liballoc/vec_deque.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1922,7 +1922,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {
19221922
}
19231923
}
19241924

1925-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1925+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
19261926
#[stable(feature = "rust1", since = "1.0.0")]
19271927
impl<'a, T> Clone for Iter<'a, T> {
19281928
fn clone(&self) -> Iter<'a, T> {

src/libcore/benches/mem.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
use test::Bencher;
1212

13-
// FIXME #13642 (these benchmarks should be in another place)
1413
// Completely miscellaneous language-construct benchmarks.
1514
// Static/dynamic method dispatch
1615

src/libcore/cmp.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ pub trait PartialEq<Rhs: ?Sized = Self> {
162162
/// ```
163163
#[stable(feature = "rust1", since = "1.0.0")]
164164
pub trait Eq: PartialEq<Self> {
165-
// FIXME #13101: this method is used solely by #[deriving] to
166-
// assert that every component of a type implements #[deriving]
165+
// this method is used solely by #[deriving] to assert
166+
// that every component of a type implements #[deriving]
167167
// itself, the current deriving infrastructure means doing this
168168
// assertion without using a method on this trait is nearly
169169
// impossible.

src/libcore/fmt/num.rs

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
1313
#![allow(deprecated)]
1414

15-
// FIXME: #6220 Implement floating point formatting
1615

1716
use fmt;
1817
use ops::{Div, Rem, Sub};

src/libcore/ptr.rs

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ use nonzero::NonZero;
2727

2828
use cmp::Ordering::{self, Less, Equal, Greater};
2929

30-
// FIXME #19649: intrinsic docs don't render, so these have no docs :(
31-
3230
#[stable(feature = "rust1", since = "1.0.0")]
3331
pub use intrinsics::copy_nonoverlapping;
3432

src/libcore/slice/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ impl<'a, T: 'a + fmt::Debug, P> fmt::Debug for Split<'a, T, P> where P: FnMut(&T
16541654
}
16551655
}
16561656

1657-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1657+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
16581658
#[stable(feature = "rust1", since = "1.0.0")]
16591659
impl<'a, T, P> Clone for Split<'a, T, P> where P: Clone + FnMut(&T) -> bool {
16601660
fn clone(&self) -> Split<'a, T, P> {
@@ -2093,7 +2093,7 @@ pub struct Windows<'a, T:'a> {
20932093
size: usize
20942094
}
20952095

2096-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
2096+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
20972097
#[stable(feature = "rust1", since = "1.0.0")]
20982098
impl<'a, T> Clone for Windows<'a, T> {
20992099
fn clone(&self) -> Windows<'a, T> {
@@ -2195,7 +2195,7 @@ pub struct Chunks<'a, T:'a> {
21952195
size: usize
21962196
}
21972197

2198-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
2198+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
21992199
#[stable(feature = "rust1", since = "1.0.0")]
22002200
impl<'a, T> Clone for Chunks<'a, T> {
22012201
fn clone(&self) -> Chunks<'a, T> {

src/libcore/tests/hash/mod.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mod sip;
1212

1313
use std::hash::{Hash, Hasher};
1414
use std::default::Default;
15+
use std::rc::Rc;
1516

1617
struct MyHasher {
1718
hash: u64,
@@ -64,12 +65,14 @@ fn test_writer_hasher() {
6465
assert_eq!(hash(& s), 97 + 0xFF);
6566
let s: Box<str> = String::from("a").into_boxed_str();
6667
assert_eq!(hash(& s), 97 + 0xFF);
68+
let s: Rc<&str> = Rc::new("a");
69+
assert_eq!(hash(&s), 97 + 0xFF);
6770
let cs: &[u8] = &[1, 2, 3];
6871
assert_eq!(hash(& cs), 9);
6972
let cs: Box<[u8]> = Box::new([1, 2, 3]);
7073
assert_eq!(hash(& cs), 9);
71-
72-
// FIXME (#18248) Add tests for hashing Rc<str> and Rc<[T]>
74+
let cs: Rc<[u8]> = Rc::new([1, 2, 3]);
75+
assert_eq!(hash(& cs), 9);
7376

7477
let ptr = 5_usize as *const i32;
7578
assert_eq!(hash(&ptr), 5);

src/libgetopts/lib.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,9 @@ pub fn usage(brief: &str, opts: &[OptGroup]) -> String {
731731
}
732732
}
733733

734-
// FIXME: #5516 should be graphemes not codepoints
734+
// FIXME(https://github.com/rust-lang-nursery/getopts/issues/7)
735+
// should be graphemes not codepoints
736+
//
735737
// here we just need to indent the start of the description
736738
let rowlen = row.chars().count();
737739
if rowlen < 24 {
@@ -749,14 +751,17 @@ pub fn usage(brief: &str, opts: &[OptGroup]) -> String {
749751
desc_normalized_whitespace.push(' ');
750752
}
751753

752-
// FIXME: #5516 should be graphemes not codepoints
754+
// FIXME(https://github.com/rust-lang-nursery/getopts/issues/7)
755+
// should be graphemes not codepoints
753756
let mut desc_rows = Vec::new();
754757
each_split_within(&desc_normalized_whitespace[..], 54, |substr| {
755758
desc_rows.push(substr.to_owned());
756759
true
757760
});
758761

759-
// FIXME: #5516 should be graphemes not codepoints
762+
// FIXME(https://github.com/rust-lang-nursery/getopts/issues/7)
763+
// should be graphemes not codepoints
764+
//
760765
// wrapped description
761766
row.push_str(&desc_rows.join(&desc_sep[..]));
762767

src/librand/isaac.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,8 @@ impl Clone for Isaac64Rng {
543543
}
544544

545545
impl Rng for Isaac64Rng {
546-
// FIXME #7771: having next_u32 like this should be unnecessary
546+
// FIXME(https://github.com/rust-lang/rfcs/issues/628)
547+
// having next_u32 like this should be unnecessary
547548
#[inline]
548549
fn next_u32(&mut self) -> u32 {
549550
self.next_u64() as u32

src/librand/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ pub trait Rng: Sized {
115115
///
116116
/// This rarely needs to be called directly, prefer `r.gen()` to
117117
/// `r.next_u32()`.
118-
// FIXME #7771: Should be implemented in terms of next_u64
118+
// FIXME(https://github.com/rust-lang/rfcs/issues/628)
119+
// Should be implemented in terms of next_u64
119120
fn next_u32(&mut self) -> u32;
120121

121122
/// Return the next random u64.

src/librustc/hir/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -916,8 +916,7 @@ impl Stmt_ {
916916
}
917917
}
918918

919-
// FIXME (pending discussion of #1697, #2178...): local should really be
920-
// a refinement on pat.
919+
// FIXME: local should really be a refinement on pat.
921920
/// Local represents a `let` statement, e.g., `let <pat>:<ty> = <expr>;`
922921
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
923922
pub struct Local {

src/libstd/collections/hash/map.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ pub struct Iter<'a, K: 'a, V: 'a> {
13501350
inner: table::Iter<'a, K, V>,
13511351
}
13521352

1353-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1353+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
13541354
#[stable(feature = "rust1", since = "1.0.0")]
13551355
impl<'a, K, V> Clone for Iter<'a, K, V> {
13561356
fn clone(&self) -> Iter<'a, K, V> {
@@ -1403,7 +1403,7 @@ pub struct Keys<'a, K: 'a, V: 'a> {
14031403
inner: Iter<'a, K, V>,
14041404
}
14051405

1406-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1406+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
14071407
#[stable(feature = "rust1", since = "1.0.0")]
14081408
impl<'a, K, V> Clone for Keys<'a, K, V> {
14091409
fn clone(&self) -> Keys<'a, K, V> {
@@ -1432,7 +1432,7 @@ pub struct Values<'a, K: 'a, V: 'a> {
14321432
inner: Iter<'a, K, V>,
14331433
}
14341434

1435-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1435+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
14361436
#[stable(feature = "rust1", since = "1.0.0")]
14371437
impl<'a, K, V> Clone for Values<'a, K, V> {
14381438
fn clone(&self) -> Values<'a, K, V> {

src/libstd/collections/hash/table.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ struct RawBuckets<'a, K, V> {
925925
marker: marker::PhantomData<&'a ()>,
926926
}
927927

928-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
928+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
929929
impl<'a, K, V> Clone for RawBuckets<'a, K, V> {
930930
fn clone(&self) -> RawBuckets<'a, K, V> {
931931
RawBuckets {
@@ -976,7 +976,7 @@ pub struct Iter<'a, K: 'a, V: 'a> {
976976
unsafe impl<'a, K: Sync, V: Sync> Sync for Iter<'a, K, V> {}
977977
unsafe impl<'a, K: Sync, V: Sync> Send for Iter<'a, K, V> {}
978978

979-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
979+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
980980
impl<'a, K, V> Clone for Iter<'a, K, V> {
981981
fn clone(&self) -> Iter<'a, K, V> {
982982
Iter {

src/libsyntax/ast.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -786,8 +786,7 @@ pub enum MacStmtStyle {
786786
NoBraces,
787787
}
788788

789-
// FIXME (pending discussion of #1697, #2178...): local should really be
790-
// a refinement on pat.
789+
// FIXME: local should really be a refinement on pat.
791790
/// Local represents a `let` statement, e.g., `let <pat>:<ty> = <expr>;`
792791
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
793792
pub struct Local {

0 commit comments

Comments
 (0)