Skip to content

Rollup of 4 pull requests #97356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 24, 2022
Merged

Rollup of 4 pull requests #97356

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b2a95cb
Lifetime variance fixes for rustdoc
compiler-errors May 22, 2022
6524259
Stabilize `cell_filter_map`
JohnTitor May 23, 2022
cec6dfc
explain how to turn integers into fn ptrs
RalfJung May 23, 2022
5137d15
sync primitive_docs
RalfJung May 23, 2022
9be37b2
Parse expression after `else` as a condition if followed by `{`
compiler-errors May 22, 2022
3569a42
Rollup merge of #97288 - compiler-errors:tcxify-rustdoc, r=Dylan-DPC
Dylan-DPC May 24, 2022
0531521
Rollup merge of #97298 - compiler-errors:if-else-stmt-braces, r=david…
Dylan-DPC May 24, 2022
af15e45
Rollup merge of #97308 - JohnTitor:stabilize-cell-filter-map, r=Mark-…
Dylan-DPC May 24, 2022
4bd4018
Rollup merge of #97321 - RalfJung:int-to-fnptr, r=Dylan-DPC
Dylan-DPC May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions library/core/src/cell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,16 +1390,14 @@ impl<'b, T: ?Sized> Ref<'b, T> {
/// # Examples
///
/// ```
/// #![feature(cell_filter_map)]
///
/// use std::cell::{RefCell, Ref};
///
/// let c = RefCell::new(vec![1, 2, 3]);
/// let b1: Ref<Vec<u32>> = c.borrow();
/// let b2: Result<Ref<u32>, _> = Ref::filter_map(b1, |v| v.get(1));
/// assert_eq!(*b2.unwrap(), 2);
/// ```
#[unstable(feature = "cell_filter_map", reason = "recently added", issue = "81061")]
#[stable(feature = "cell_filter_map", since = "1.63.0")]
#[inline]
pub fn filter_map<U: ?Sized, F>(orig: Ref<'b, T>, f: F) -> Result<Ref<'b, U>, Self>
where
Expand Down Expand Up @@ -1538,8 +1536,6 @@ impl<'b, T: ?Sized> RefMut<'b, T> {
/// # Examples
///
/// ```
/// #![feature(cell_filter_map)]
///
/// use std::cell::{RefCell, RefMut};
///
/// let c = RefCell::new(vec![1, 2, 3]);
Expand All @@ -1555,7 +1551,7 @@ impl<'b, T: ?Sized> RefMut<'b, T> {
///
/// assert_eq!(*c.borrow(), vec![1, 4, 3]);
/// ```
#[unstable(feature = "cell_filter_map", reason = "recently added", issue = "81061")]
#[stable(feature = "cell_filter_map", since = "1.63.0")]
#[inline]
pub fn filter_map<U: ?Sized, F>(mut orig: RefMut<'b, T>, f: F) -> Result<RefMut<'b, U>, Self>
where
Expand Down