Skip to content
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.

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

Stabilize `Option::flatten` #64747

Merged
merged 1 commit into from Oct 28, 2019

Conversation

@ethanboxx
Copy link
Contributor

ethanboxx commented Sep 24, 2019

@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.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Sep 24, 2019

r? @kennytm

(rust_highfive has picked a reviewer for you, use r? to override)

@Centril

This comment has been minimized.

Copy link
Member

Centril commented Sep 24, 2019

PR looks good; excited about this!

cc @alexcrichton

@Centril Centril assigned alexcrichton and unassigned kennytm Sep 24, 2019
@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Sep 24, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-09-24T19:27:08.8452537Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-24T19:27:08.8646697Z ##[command]git config gc.auto 0
2019-09-24T19:27:08.8704288Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-24T19:27:08.8771574Z ##[command]git config --get-all http.proxy
2019-09-24T19:27:09.7228838Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64747/merge:refs/remotes/pull/64747/merge
---
2019-09-24T20:30:53.4475015Z .................................................................................................... 1500/9038
2019-09-24T20:30:59.7788910Z .................................................................................................... 1600/9038
2019-09-24T20:31:12.6668935Z .........................................................................i...............i.......... 1700/9038
2019-09-24T20:31:19.8640721Z .................................................................................................... 1800/9038
2019-09-24T20:31:28.6760622Z ................................................................iiiii............................... 1900/9038
2019-09-24T20:31:48.7254727Z .................................................................................................... 2100/9038
2019-09-24T20:31:51.4222725Z .................................................................................................... 2200/9038
2019-09-24T20:31:54.8329811Z .................................................................................................... 2300/9038
2019-09-24T20:32:03.7112923Z .................................................................................................... 2400/9038
---
2019-09-24T20:35:09.3151237Z .....................................................i...............i.............................. 4700/9038
2019-09-24T20:35:19.3658537Z .................................................................................................... 4800/9038
2019-09-24T20:35:27.6524256Z .................................................................................................... 4900/9038
2019-09-24T20:35:35.4723387Z .................................................................................................... 5000/9038
2019-09-24T20:35:45.4316936Z ........................................ii.ii....................................................... 5100/9038
2019-09-24T20:35:55.8058658Z .................................................................................................... 5300/9038
2019-09-24T20:36:06.7281954Z .................................................................................................... 5400/9038
2019-09-24T20:36:14.4967851Z .....i.............................................................................................. 5500/9038
2019-09-24T20:36:20.0427124Z .................................................................................................... 5600/9038
2019-09-24T20:36:20.0427124Z .................................................................................................... 5600/9038
2019-09-24T20:36:32.1842638Z .................................................................................................... 5700/9038
2019-09-24T20:36:45.9290762Z .ii..i..ii...........i.............................................................................. 5800/9038
2019-09-24T20:37:08.5858207Z .................................................................................................... 6000/9038
2019-09-24T20:37:15.5798654Z .................................................................................................... 6100/9038
2019-09-24T20:37:15.5798654Z .................................................................................................... 6100/9038
2019-09-24T20:37:30.2738778Z ..i..ii............................................................................................. 6200/9038
2019-09-24T20:37:49.7147679Z ..............................................................i..................................... 6400/9038
2019-09-24T20:37:52.0302209Z .................................................................................................... 6500/9038
2019-09-24T20:37:54.6436506Z ..................................i................................................................. 6600/9038
2019-09-24T20:37:58.9581838Z .................................................................................................... 6700/9038
---
2019-09-24T20:42:38.0978432Z  finished in 5.526
2019-09-24T20:42:38.1180221Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-24T20:42:38.2887315Z 
2019-09-24T20:42:38.2889092Z running 150 tests
2019-09-24T20:42:41.6835595Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/150
2019-09-24T20:42:43.7402663Z ..iiii..............i.........iii.i.......ii......
2019-09-24T20:42:43.7403266Z 
2019-09-24T20:42:43.7403822Z  finished in 5.622
2019-09-24T20:42:43.7586601Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-24T20:42:43.9225459Z 
---
2019-09-24T20:42:46.0787479Z  finished in 2.319
2019-09-24T20:42:46.0972854Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-24T20:42:46.2606407Z 
2019-09-24T20:42:46.2607971Z running 9 tests
2019-09-24T20:42:46.2609510Z iiiiiiiii
2019-09-24T20:42:46.2609936Z 
2019-09-24T20:42:46.2609982Z  finished in 0.162
2019-09-24T20:42:46.2793402Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-24T20:42:46.4450295Z 
---
2019-09-24T20:43:05.6888772Z  finished in 19.409
2019-09-24T20:43:05.7089823Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-24T20:43:05.8802564Z 
2019-09-24T20:43:05.8802859Z running 123 tests
2019-09-24T20:43:31.0259023Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-09-24T20:43:35.9013974Z i.i.i......iii.i.....ii
2019-09-24T20:43:35.9014484Z 
2019-09-24T20:43:35.9014634Z  finished in 30.192
2019-09-24T20:43:35.9025951Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-24T20:43:35.9026321Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-09-24T20:53:58.4812114Z == clock drift check ==
2019-09-24T20:53:58.4828346Z   local time: Tue Sep 24 20:53:58 UTC 2019
2019-09-24T20:53:58.6338805Z   network time: Tue, 24 Sep 2019 20:53:58 GMT
2019-09-24T20:53:58.6345980Z == end clock drift check ==
2019-09-24T20:54:00.1404602Z ##[error]Bash exited with code '1'.
2019-09-24T20:54:00.1466702Z ##[section]Starting: Checkout
2019-09-24T20:54:00.1468695Z ==============================================================================
2019-09-24T20:54:00.1468763Z Task         : Get sources
2019-09-24T20:54:00.1468823Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@hellow554 hellow554 referenced this pull request Sep 25, 2019
@hellow554

This comment was marked as resolved.

Copy link
Contributor

hellow554 commented Sep 25, 2019

#![feature(option_flattening)]

needs to be removed as well

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 25, 2019

@rfcbot fcp merge

@rfcbot

This comment has been minimized.

Copy link

rfcbot commented Sep 25, 2019

Team member @alexcrichton has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@Centril

This comment has been minimized.

Copy link
Member

Centril commented Oct 11, 2019

@rfcbot

This comment has been minimized.

Copy link

rfcbot commented Oct 17, 2019

🔔 This is now entering its final comment period, as per the review above. 🔔

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 19, 2019

☔️ The latest upstream changes (presumably #65588) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril

This comment has been minimized.

Copy link
Member

Centril commented Oct 19, 2019

@ethanboxx Can you please squash the commits into one? (We do not allow merge commits in the history.)

@ethanboxx ethanboxx force-pushed the ethanboxx:master branch from 3c76c3a to 39dd9b7 Oct 19, 2019
@ethanboxx ethanboxx force-pushed the ethanboxx:master branch from 39dd9b7 to 65af429 Oct 19, 2019
@Centril

This comment has been minimized.

Copy link
Member

Centril commented Oct 24, 2019

r? @Centril r=me rollup when FCP has completed.

@rfcbot

This comment has been minimized.

Copy link

rfcbot commented Oct 27, 2019

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

@Centril

This comment has been minimized.

Copy link
Member

Centril commented Oct 27, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 27, 2019

📌 Commit 65af429 has been approved by Centril

Centril added a commit to Centril/rust that referenced this pull request Oct 27, 2019
Stabilize `Option::flatten`

- PR: rust-lang#60256
- Tracking issue: rust-lang#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.
bors added a commit that referenced this pull request Oct 27, 2019
Rollup of 7 pull requests

Successful merges:

 - #63871 (Add #[must_use] to all functions 'fn(float) -> float')
 - #64747 (Stabilize `Option::flatten`)
 - #65421 (Point at local similarly named element and tweak references to variants)
 - #65792 (rustc, rustc_passes: reduce deps on rustc_expand)
 - #65849 (librustc_lexer: Enhance documentation)
 - #65873 (doc: explain why it is unsafe to construct Vec<u8> from Vec<u16>)
 - #65877 (doc: introduce `once` in `iter::chain` document)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Oct 28, 2019
Stabilize `Option::flatten`

- PR: rust-lang#60256
- Tracking issue: rust-lang#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.
bors added a commit that referenced this pull request Oct 28, 2019
Rollup of 6 pull requests

Successful merges:

 - #64747 (Stabilize `Option::flatten`)
 - #65664 (`std::panic::Location` is a lang_item, add `core::intrinsics::caller_location` (RFC 2091 3/N))
 - #65792 (rustc, rustc_passes: reduce deps on rustc_expand)
 - #65849 (librustc_lexer: Enhance documentation)
 - #65873 (doc: explain why it is unsafe to construct Vec<u8> from Vec<u16>)
 - #65880 (Gather together usefulness tests)

Failed merges:

r? @ghost
@bors bors merged commit 65af429 into rust-lang:master Oct 28, 2019
4 checks passed
4 checks passed
pr Build #20191019.26 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@lonng lonng referenced this pull request Nov 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.