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

Rename iter::unfold to iter::from_fn and remove explicit state #58062

Merged
merged 1 commit into from Feb 3, 2019

Conversation

Projects
None yet
5 participants
@SimonSapin
Copy link
Contributor

SimonSapin commented Feb 1, 2019

This API is unstable.

CC #55977 (comment)

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 1, 2019

r? @shepmaster

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

@SimonSapin SimonSapin referenced this pull request Feb 1, 2019

Open

Tracking issue for std::iter::from_fn #55977

2 of 2 tasks complete
@SimonSapin

This comment has been minimized.

Copy link
Contributor Author

SimonSapin commented Feb 1, 2019

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Feb 2, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 2, 2019

📌 Commit 61e92b5 has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 2, 2019

⌛️ Testing commit 61e92b5 with merge 0bb47da...

bors added a commit that referenced this pull request Feb 2, 2019

Auto merge of #58062 - SimonSapin:iter_from_fn, r=alexcrichton
Rename iter::unfold to iter::from_fn and remove explicit state

This API is unstable.

CC #55977 (comment)
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 2, 2019

💔 Test failed - status-appveyor

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 2, 2019

Your PR failed on Travis (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.
Cloning into 'rust-lang/rust'...
travis_time:end:020a21d2:start=1549137200427493267,finish=1549137206915715197,duration=6488221930
$ cd rust-lang/rust
$ git checkout -qf 0bb47daa688694e1e24cbeba1521c469817f2b16
fatal: reference is not a tree: 0bb47daa688694e1e24cbeba1521c469817f2b16
The command "git checkout -qf 0bb47daa688694e1e24cbeba1521c469817f2b16" failed and exited with 128 during .
Your build has been stopped.

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)

@SimonSapin

This comment has been minimized.

Copy link
Contributor Author

SimonSapin commented Feb 2, 2019

@bors retry

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 2, 2019

⌛️ Testing commit 61e92b5 with merge 555669d...

bors added a commit that referenced this pull request Feb 2, 2019

Auto merge of #58062 - SimonSapin:iter_from_fn, r=alexcrichton
Rename iter::unfold to iter::from_fn and remove explicit state

This API is unstable.

CC #55977 (comment)
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 3, 2019

💔 Test failed - status-appveyor

@shepmaster

This comment has been minimized.

Copy link
Member

shepmaster commented Feb 3, 2019

@SimonSapin

This comment has been minimized.

Copy link
Contributor Author

SimonSapin commented Feb 3, 2019

Hmm, the only thing wrong I can find in the log is:

error[E0061]: this function takes 4 parameters but 3 parameters were supplied
   --> src\tools\rls\src\build\rustc.rs:214:12
    |
214 |         ls.register_early_pass(Some(sess), true, pass);
    |            ^^^^^^^^^^^^^^^^^^^ expected 4 parameters
error: aborting due to previous error
For more information about this error, try `rustc --explain E0061`.
[RUSTC-TIMING] rls test:false 3.535
error: Could not compile `rls`.
To learn more, run the command again with --verbose.
command did not execute successfully: "C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage0\\bin\\cargo.exe" "build" "--target" "x86_64-pc-windows-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "C:\\projects\\rust\\src/tools/rls\\Cargo.toml" "--features" "clippy, rustc-workspace-hack/all-static" "--message-format" "json"
expected success, got: exit code: 101
[TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-pc-windows-gnu" }, target: "x86_64-pc-windows-gnu", tool: "rls", path: "src/tools/rls", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: ["clippy"] } -- 247.135
Unable to build RLS, skipping dist

… but that last line suggests it should not make the build fail.

@bors retry

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 3, 2019

⌛️ Testing commit 61e92b5 with merge fc6e9a2...

bors added a commit that referenced this pull request Feb 3, 2019

Auto merge of #58062 - SimonSapin:iter_from_fn, r=alexcrichton
Rename iter::unfold to iter::from_fn and remove explicit state

This API is unstable.

CC #55977 (comment)
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 3, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing fc6e9a2 to master...

@bors bors merged commit 61e92b5 into rust-lang:master Feb 3, 2019

1 check passed

homu Test successful
Details

kennytm added a commit to kennytm/rust that referenced this pull request Feb 7, 2019

Rollup merge of rust-lang#58237 - sdroege:docs-its-its, r=SimonSapin
Fix broken grammar in iter::from_fn() docs

Was introduced by rust-lang#58062

CC @SimonSapin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment