Skip to content

Commit 417c738

Browse files
borsbors
committed
Auto merge of #44943 - nivkner:fixme_fixup, r=dtolnay
address some FIXME whose associated issues were marked as closed part of #44366
2 parents 4531131 + 559adb7 commit 417c738

File tree

18 files changed

+84
-53
lines changed

18 files changed

+84
-53
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/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/libcore/benches/mem.rs ‎src/librustc/benches/dispatch.rs

-26
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
use test::Bencher;
1212

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

1715
struct Struct {
@@ -44,27 +42,3 @@ fn trait_static_method_call(b: &mut Bencher) {
4442
s.method()
4543
});
4644
}
47-
48-
// Overhead of various match forms
49-
50-
#[bench]
51-
fn match_option_some(b: &mut Bencher) {
52-
let x = Some(10);
53-
b.iter(|| {
54-
match x {
55-
Some(y) => y,
56-
None => 11
57-
}
58-
});
59-
}
60-
61-
#[bench]
62-
fn match_vec_pattern(b: &mut Bencher) {
63-
let x = [1,2,3,4,5,6];
64-
b.iter(|| {
65-
match x {
66-
[1,2,3,..] => 10,
67-
_ => 11,
68-
}
69-
});
70-
}

‎src/librustc/benches/lib.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![deny(warnings)]
12+
13+
#![feature(slice_patterns)]
14+
#![feature(test)]
15+
16+
extern crate test;
17+
18+
mod dispatch;
19+
mod pattern;

‎src/librustc/benches/pattern.rs

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use test::Bencher;
12+
13+
// Overhead of various match forms
14+
15+
#[bench]
16+
fn option_some(b: &mut Bencher) {
17+
let x = Some(10);
18+
b.iter(|| {
19+
match x {
20+
Some(y) => y,
21+
None => 11
22+
}
23+
});
24+
}
25+
26+
#[bench]
27+
fn vec_pattern(b: &mut Bencher) {
28+
let x = [1,2,3,4,5,6];
29+
b.iter(|| {
30+
match x {
31+
[1,2,3,..] => 10,
32+
_ => 11,
33+
}
34+
});
35+
}

‎src/librustc/hir/mod.rs

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

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

‎src/libstd/collections/hash/map.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,7 @@ pub struct Iter<'a, K: 'a, V: 'a> {
13611361
inner: table::Iter<'a, K, V>,
13621362
}
13631363

1364-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1364+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
13651365
#[stable(feature = "rust1", since = "1.0.0")]
13661366
impl<'a, K, V> Clone for Iter<'a, K, V> {
13671367
fn clone(&self) -> Iter<'a, K, V> {
@@ -1414,7 +1414,7 @@ pub struct Keys<'a, K: 'a, V: 'a> {
14141414
inner: Iter<'a, K, V>,
14151415
}
14161416

1417-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1417+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
14181418
#[stable(feature = "rust1", since = "1.0.0")]
14191419
impl<'a, K, V> Clone for Keys<'a, K, V> {
14201420
fn clone(&self) -> Keys<'a, K, V> {
@@ -1443,7 +1443,7 @@ pub struct Values<'a, K: 'a, V: 'a> {
14431443
inner: Iter<'a, K, V>,
14441444
}
14451445

1446-
// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
1446+
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
14471447
#[stable(feature = "rust1", since = "1.0.0")]
14481448
impl<'a, K, V> Clone for Values<'a, K, V> {
14491449
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

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

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

0 commit comments

Comments
 (0)