diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-22 17:51:25 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-03-22 22:43:37 +0800 |
| commit | 8d3f3f0cac3de7dfbb126db3c48d7499c96d86ec (patch) | |
| tree | 1ea48d9447fff532f6598dee6899a42ec36a687c /src/libcore | |
| parent | 245f4c4631401c9a25ed62e8f75b97607b3b38bb (diff) | |
| parent | 66d120cd263ea77a44fcde9409a71ac673a5262c (diff) | |
| download | rust-8d3f3f0cac3de7dfbb126db3c48d7499c96d86ec.tar.gz rust-8d3f3f0cac3de7dfbb126db3c48d7499c96d86ec.zip | |
Rollup merge of #49117 - nivkner:fixme_fixup3, r=estebank
address some FIXME whose associated issues were marked as closed part of #44366
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/convert.rs | 4 | ||||
| -rw-r--r-- | src/libcore/iter/mod.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index d3a83dc795c..2206910c93f 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -382,7 +382,7 @@ impl<'a, T: ?Sized, U: ?Sized> AsRef<U> for &'a mut T where T: AsRef<U> } } -// FIXME (#23442): replace the above impls for &/&mut with the following more general one: +// FIXME (#45742): replace the above impls for &/&mut with the following more general one: // // As lifts over Deref // impl<D: ?Sized + Deref, U: ?Sized> AsRef<U> for D where D::Target: AsRef<U> { // fn as_ref(&self) -> &U { @@ -399,7 +399,7 @@ impl<'a, T: ?Sized, U: ?Sized> AsMut<U> for &'a mut T where T: AsMut<U> } } -// FIXME (#23442): replace the above impl for &mut with the following more general one: +// FIXME (#45742): replace the above impl for &mut with the following more general one: // // AsMut lifts over DerefMut // impl<D: ?Sized + Deref, U: ?Sized> AsMut<U> for D where D::Target: AsMut<U> { // fn as_mut(&mut self) -> &mut U { diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs index b1b783b47c7..1e8476d3880 100644 --- a/src/libcore/iter/mod.rs +++ b/src/libcore/iter/mod.rs @@ -1872,7 +1872,7 @@ impl<I: Iterator> Iterator for Peekable<I> { #[inline] fn nth(&mut self, n: usize) -> Option<I::Item> { - // FIXME(#6393): merge these when borrow-checking gets better. + // FIXME(#43234): merge these when borrow-checking gets better. if n == 0 { match self.peeked.take() { Some(v) => v, |