Auto merge of #44943 - nivkner:fixme_fixup, r=dtolnay

bors · bors · commit 417c73891ffd · 2017-10-05T19:52:00.000Z
address some FIXME whose associated issues were marked as closed part of #44366
diff --git a/src/liballoc/binary_heap.rs b/src/liballoc/binary_heap.rs
@@ -926,7 +926,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {
     }
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T> Clone for Iter<'a, T> {
     fn clone(&self) -> Iter<'a, T> {
diff --git a/src/liballoc/linked_list.rs b/src/liballoc/linked_list.rs
@@ -80,7 +80,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {
     }
 }
 
-// FIXME #19839: deriving is too aggressive on the bounds (T doesn't need to be Clone).
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T> Clone for Iter<'a, T> {
     fn clone(&self) -> Self {
diff --git a/src/liballoc/vec_deque.rs b/src/liballoc/vec_deque.rs
@@ -1922,7 +1922,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {
     }
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T> Clone for Iter<'a, T> {
     fn clone(&self) -> Iter<'a, T> {
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs
@@ -162,8 +162,8 @@ pub trait PartialEq<Rhs: ?Sized = Self> {
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait Eq: PartialEq<Self> {
-    // FIXME #13101: this method is used solely by #[deriving] to
-    // assert that every component of a type implements #[deriving]
+    // this method is used solely by #[deriving] to assert
+    // that every component of a type implements #[deriving]
     // itself, the current deriving infrastructure means doing this
     // assertion without using a method on this trait is nearly
     // impossible.
diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs
@@ -12,7 +12,6 @@
 
 #![allow(deprecated)]
 
-// FIXME: #6220 Implement floating point formatting
 
 use fmt;
 use ops::{Div, Rem, Sub};
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
@@ -27,8 +27,6 @@ use nonzero::NonZero;
 
 use cmp::Ordering::{self, Less, Equal, Greater};
 
-// FIXME #19649: intrinsic docs don't render, so these have no docs :(
-
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use intrinsics::copy_nonoverlapping;
 
diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs
@@ -1654,7 +1654,7 @@ impl<'a, T: 'a + fmt::Debug, P> fmt::Debug for Split<'a, T, P> where P: FnMut(&T
     }
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T, P> Clone for Split<'a, T, P> where P: Clone + FnMut(&T) -> bool {
     fn clone(&self) -> Split<'a, T, P> {
@@ -2093,7 +2093,7 @@ pub struct Windows<'a, T:'a> {
     size: usize
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T> Clone for Windows<'a, T> {
     fn clone(&self) -> Windows<'a, T> {
@@ -2195,7 +2195,7 @@ pub struct Chunks<'a, T:'a> {
     size: usize
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T> Clone for Chunks<'a, T> {
     fn clone(&self) -> Chunks<'a, T> {
diff --git a/src/libcore/tests/hash/mod.rs b/src/libcore/tests/hash/mod.rs
@@ -12,6 +12,7 @@ mod sip;
 
 use std::hash::{Hash, Hasher};
 use std::default::Default;
+use std::rc::Rc;
 
 struct MyHasher {
     hash: u64,
@@ -64,12 +65,14 @@ fn test_writer_hasher() {
     assert_eq!(hash(& s), 97 + 0xFF);
     let s: Box<str> = String::from("a").into_boxed_str();
     assert_eq!(hash(& s), 97 + 0xFF);
+    let s: Rc<&str> = Rc::new("a");
+    assert_eq!(hash(&s), 97 + 0xFF);
     let cs: &[u8] = &[1, 2, 3];
     assert_eq!(hash(& cs), 9);
     let cs: Box<[u8]> = Box::new([1, 2, 3]);
     assert_eq!(hash(& cs), 9);
-
-    // FIXME (#18248) Add tests for hashing Rc<str> and Rc<[T]>
+    let cs: Rc<[u8]> = Rc::new([1, 2, 3]);
+    assert_eq!(hash(& cs), 9);
 
     let ptr = 5_usize as *const i32;
     assert_eq!(hash(&ptr), 5);
diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs
@@ -731,7 +731,9 @@ pub fn usage(brief: &str, opts: &[OptGroup]) -> String {
             }
         }
 
-        // FIXME: #5516 should be graphemes not codepoints
+        // FIXME(https://github.com/rust-lang-nursery/getopts/issues/7)
+        // should be graphemes not codepoints
+        //
         // here we just need to indent the start of the description
         let rowlen = row.chars().count();
         if rowlen < 24 {
@@ -749,14 +751,17 @@ pub fn usage(brief: &str, opts: &[OptGroup]) -> String {
             desc_normalized_whitespace.push(' ');
         }
 
-        // FIXME: #5516 should be graphemes not codepoints
+        // FIXME(https://github.com/rust-lang-nursery/getopts/issues/7)
+        // should be graphemes not codepoints
         let mut desc_rows = Vec::new();
         each_split_within(&desc_normalized_whitespace[..], 54, |substr| {
             desc_rows.push(substr.to_owned());
             true
         });
 
-        // FIXME: #5516 should be graphemes not codepoints
+        // FIXME(https://github.com/rust-lang-nursery/getopts/issues/7)
+        // should be graphemes not codepoints
+        //
         // wrapped description
         row.push_str(&desc_rows.join(&desc_sep[..]));
 
diff --git a/src/librand/isaac.rs b/src/librand/isaac.rs
@@ -543,7 +543,8 @@ impl Clone for Isaac64Rng {
 }
 
 impl Rng for Isaac64Rng {
-    // FIXME #7771: having next_u32 like this should be unnecessary
+    // FIXME(https://github.com/rust-lang/rfcs/issues/628)
+    // having next_u32 like this should be unnecessary
     #[inline]
     fn next_u32(&mut self) -> u32 {
         self.next_u64() as u32
diff --git a/src/librand/lib.rs b/src/librand/lib.rs
@@ -115,7 +115,8 @@ pub trait Rng: Sized {
     ///
     /// This rarely needs to be called directly, prefer `r.gen()` to
     /// `r.next_u32()`.
-    // FIXME #7771: Should be implemented in terms of next_u64
+    // FIXME(https://github.com/rust-lang/rfcs/issues/628)
+    // Should be implemented in terms of next_u64
     fn next_u32(&mut self) -> u32;
 
     /// Return the next random u64.
diff --git a/src/librustc/benches/dispatch.rs b/src/librustc/benches/dispatch.rs
@@ -10,8 +10,6 @@
 
 use test::Bencher;
 
-// FIXME #13642 (these benchmarks should be in another place)
-// Completely miscellaneous language-construct benchmarks.
 // Static/dynamic method dispatch
 
 struct Struct {
@@ -44,27 +42,3 @@ fn trait_static_method_call(b: &mut Bencher) {
         s.method()
     });
 }
-
-// Overhead of various match forms
-
-#[bench]
-fn match_option_some(b: &mut Bencher) {
-    let x = Some(10);
-    b.iter(|| {
-        match x {
-            Some(y) => y,
-            None => 11
-        }
-    });
-}
-
-#[bench]
-fn match_vec_pattern(b: &mut Bencher) {
-    let x = [1,2,3,4,5,6];
-    b.iter(|| {
-        match x {
-            [1,2,3,..] => 10,
-            _ => 11,
-        }
-    });
-}
diff --git a/src/librustc/benches/lib.rs b/src/librustc/benches/lib.rs
@@ -0,0 +1,19 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![deny(warnings)]
+
+#![feature(slice_patterns)]
+#![feature(test)]
+
+extern crate test;
+
+mod dispatch;
+mod pattern;
diff --git a/src/librustc/benches/pattern.rs b/src/librustc/benches/pattern.rs
@@ -0,0 +1,35 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use test::Bencher;
+
+// Overhead of various match forms
+
+#[bench]
+fn option_some(b: &mut Bencher) {
+    let x = Some(10);
+    b.iter(|| {
+        match x {
+            Some(y) => y,
+            None => 11
+        }
+    });
+}
+
+#[bench]
+fn vec_pattern(b: &mut Bencher) {
+    let x = [1,2,3,4,5,6];
+    b.iter(|| {
+        match x {
+            [1,2,3,..] => 10,
+            _ => 11,
+        }
+    });
+}
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
@@ -916,8 +916,6 @@ impl Stmt_ {
     }
 }
 
-// FIXME (pending discussion of #1697, #2178...): local should really be
-// a refinement on pat.
 /// Local represents a `let` statement, e.g., `let <pat>:<ty> = <expr>;`
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
 pub struct Local {
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
@@ -1361,7 +1361,7 @@ pub struct Iter<'a, K: 'a, V: 'a> {
     inner: table::Iter<'a, K, V>,
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, K, V> Clone for Iter<'a, K, V> {
     fn clone(&self) -> Iter<'a, K, V> {
@@ -1414,7 +1414,7 @@ pub struct Keys<'a, K: 'a, V: 'a> {
     inner: Iter<'a, K, V>,
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, K, V> Clone for Keys<'a, K, V> {
     fn clone(&self) -> Keys<'a, K, V> {
@@ -1443,7 +1443,7 @@ pub struct Values<'a, K: 'a, V: 'a> {
     inner: Iter<'a, K, V>,
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, K, V> Clone for Values<'a, K, V> {
     fn clone(&self) -> Values<'a, K, V> {
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
@@ -925,7 +925,7 @@ struct RawBuckets<'a, K, V> {
     marker: marker::PhantomData<&'a ()>,
 }
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 impl<'a, K, V> Clone for RawBuckets<'a, K, V> {
     fn clone(&self) -> RawBuckets<'a, K, V> {
         RawBuckets {
@@ -976,7 +976,7 @@ pub struct Iter<'a, K: 'a, V: 'a> {
 unsafe impl<'a, K: Sync, V: Sync> Sync for Iter<'a, K, V> {}
 unsafe impl<'a, K: Sync, V: Sync> Send for Iter<'a, K, V> {}
 
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
 impl<'a, K, V> Clone for Iter<'a, K, V> {
     fn clone(&self) -> Iter<'a, K, V> {
         Iter {
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
@@ -786,8 +786,6 @@ pub enum MacStmtStyle {
     NoBraces,
 }
 
-// FIXME (pending discussion of #1697, #2178...): local should really be
-// a refinement on pat.
 /// Local represents a `let` statement, e.g., `let <pat>:<ty> = <expr>;`
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
 pub struct Local {

Original file line number	Diff line number	Diff line change
`@@ -926,7 +926,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {`
`926`	`926`	`}`
`927`	`927`	`}`
`928`	`928`
`929`		-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
	`929`	+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
`930`	`930`	`#[stable(feature = "rust1", since = "1.0.0")]`
`931`	`931`	`impl<'a, T> Clone for Iter<'a, T> {`
`932`	`932`	`fn clone(&self) -> Iter<'a, T> {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`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)]`
`84`	`84`	`#[stable(feature = "rust1", since = "1.0.0")]`
`85`	`85`	`impl<'a, T> Clone for Iter<'a, T> {`
`86`	`86`	`fn clone(&self) -> Self {`
Original file line number	Diff line number	Diff line change
`@@ -1922,7 +1922,7 @@ impl<'a, T: 'a + fmt::Debug> fmt::Debug for Iter<'a, T> {`
`1922`	`1922`	`}`
`1923`	`1923`	`}`
`1924`	`1924`
`1925`		-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
	`1925`	+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
`1926`	`1926`	`#[stable(feature = "rust1", since = "1.0.0")]`
`1927`	`1927`	`impl<'a, T> Clone for Iter<'a, T> {`
`1928`	`1928`	`fn clone(&self) -> Iter<'a, T> {`
Original file line number	Diff line number	Diff line change
`@@ -1654,7 +1654,7 @@ impl<'a, T: 'a + fmt::Debug, P> fmt::Debug for Split<'a, T, P> where P: FnMut(&T`
`1654`	`1654`	`}`
`1655`	`1655`	`}`
`1656`	`1656`
`1657`		-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
	`1657`	+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
`1658`	`1658`	`#[stable(feature = "rust1", since = "1.0.0")]`
`1659`	`1659`	`impl<'a, T, P> Clone for Split<'a, T, P> where P: Clone + FnMut(&T) -> bool {`
`1660`	`1660`	`fn clone(&self) -> Split<'a, T, P> {`
`@@ -2093,7 +2093,7 @@ pub struct Windows<'a, T:'a> {`
`2093`	`2093`	`size: usize`
`2094`	`2094`	`}`
`2095`	`2095`
`2096`		-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
	`2096`	+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
`2097`	`2097`	`#[stable(feature = "rust1", since = "1.0.0")]`
`2098`	`2098`	`impl<'a, T> Clone for Windows<'a, T> {`
`2099`	`2099`	`fn clone(&self) -> Windows<'a, T> {`
`@@ -2195,7 +2195,7 @@ pub struct Chunks<'a, T:'a> {`
`2195`	`2195`	`size: usize`
`2196`	`2196`	`}`
`2197`	`2197`
`2198`		-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
	`2198`	+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
`2199`	`2199`	`#[stable(feature = "rust1", since = "1.0.0")]`
`2200`	`2200`	`impl<'a, T> Clone for Chunks<'a, T> {`
`2201`	`2201`	`fn clone(&self) -> Chunks<'a, T> {`
Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,8 @@ impl Clone for Isaac64Rng {`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`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`
`547`	`548`	`#[inline]`
`548`	`549`	`fn next_u32(&mut self) -> u32 {`
`549`	`550`	`self.next_u64() as u32`