about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-10-28 04:53:05 +0100
committerGitHub <noreply@github.com>2019-10-28 04:53:05 +0100
commitc8eefdffe9480bbd84554eab3343f71f04af8f9a (patch)
treeb7bf480b2c5b6a005db6a0d4d2b7549a791bdf5e /src/liballoc
parent95f437b3cfb2fec966d7eaf69d7c2e36f9c274d1 (diff)
parent65af429c681e874bee6fb3a864ae3496517a72f4 (diff)
downloadrust-c8eefdffe9480bbd84554eab3343f71f04af8f9a.tar.gz
rust-c8eefdffe9480bbd84554eab3343f71f04af8f9a.zip
Rollup merge of #64747 - ethanboxx:master, r=Centril
Stabilize `Option::flatten`

- PR: https://github.com/rust-lang/rust/pull/60256
- Tracking issue: https://github.com/rust-lang/rust/issues/60258

@elahn

> I was trying to `flat_map()` and found `map().flatten()` does the trick. This has been on nightly for 4 months, can we stabilise it?

@ethanboxx

> @Centril Helped me get this merged. What is the stabilization process?

@Centril

> @ethanboxx I'd just file a PR to stabilize it and we'll ask T-libs to FCP.

So here I am.

I am was unsure what number to put in `since = "-"` so I copied what someone had done in a recent PR.
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/tests/lib.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs
index 676874c8b27..79e5ba340b7 100644
--- a/src/liballoc/tests/lib.rs
+++ b/src/liballoc/tests/lib.rs
@@ -3,7 +3,6 @@
 #![feature(drain_filter)]
 #![feature(exact_size_is_empty)]
 #![feature(new_uninit)]
-#![feature(option_flattening)]
 #![feature(pattern)]
 #![feature(trusted_len)]
 #![feature(try_reserve)]