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.

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

Jump to bottom

[Rust 1.35] Remove FnBox and use builtin impl FnOnce for Box<FnOnce()> instead. #1906

Merged
merged 1 commit into from
Nov 13, 2019
Merged

[Rust 1.35] Remove FnBox and use builtin impl FnOnce for Box<FnOnce()> instead. #1906

merged 1 commit into from
Nov 13, 2019

Conversation

crlf0710
Copy link
Member

@crlf0710 crlf0710 commented Apr 9, 2019

No description provided.

@L0uisc
Copy link
Contributor

L0uisc commented Apr 9, 2019

Travis CI fails on spellchecking FnBox. You need to add FnBox back to the dictionary or remove the other occurrences of it as well for the build to succeed.

@crlf0710
Copy link
Member Author

Fixed. Now the only thing left is that the new code needs 1.35 to run, but the CI is 1.31.

L0uisc
L0uisc reviewed Apr 10, 2019
View reviewed changes
src/ch20-03-graceful-shutdown-and-cleanup.md
@@ -536,7 +526,7 @@ impl Worker {
Message::NewJob(job) => {
println!("Worker {} got a job; executing.", id);

job.call_box();
job();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can actually ignore this block for now. See b93ec30

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, but i think we can also bump travis to use beta, since that will be released really soon. It's not urgent to merge this anyway.

@carols10cents
Copy link
Member

Fixed. Now the only thing left is that the new code needs 1.35 to run, but the CI is 1.31.

Yes, this is on purpose. We're working on sending a batch of updates to No Starch for print, and those are all going to be for 1.31. Once we finalize that batch of updates, I'll bump CI and we can merge this. For now, this is blocked though. Thanks!

@carols10cents carols10cents added the blocked Blocked on a change we need to make in this repo label Apr 11, 2019
@carols10cents carols10cents added this to the ch20 milestone Apr 12, 2019
@UnHumbleBen
Copy link
Contributor

Are there any updates on when this will be merged? I am currently reading this chapter and it is a bit confusing how there is a built in way to accomplish what the book claims is currently not possible in Rust.

@steveklabnik
Copy link
Member

steveklabnik commented Jul 31, 2019 via email

@runiq
Copy link

runiq commented Oct 8, 2019

Hi, any chance to have this merged? I was also initially confused about this, just like @UnHumbleBen :)

steveklabnik
steveklabnik approved these changes Nov 13, 2019
View reviewed changes
Copy link
Member

@steveklabnik steveklabnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much! Sorry this took a while to merge.

@steveklabnik steveklabnik merged commit 120e76a into rust-lang:master Nov 13, 2019
@steveklabnik steveklabnik removed the blocked Blocked on a change we need to make in this repo label Nov 13, 2019
@crlf0710 crlf0710 deleted the remove_fnbox branch November 13, 2019 17:44
@joekyo joekyo mentioned this pull request Nov 14, 2019
Closed
@ehuss ehuss mentioned this pull request Nov 25, 2019
Merged
bors added a commit to rust-lang/rust that referenced this pull request Nov 25, 2019
@bors
Auto merge of #66748 - ehuss:update-cargo-books, r=alexcrichton
91642e3 
Update cargo, rls, books.

## nomicon

1 commits in 58e36e0e08dec5a379ac568827c058e25990d6cd..041c46e692a2592853aeca132c8dfe8eb5a79a9e
2019-10-30 08:14:24 -0500 to 2019-11-20 16:46:45 +0100
- Update unsafe-code-guidelines link (rust-lang/nomicon#175)

## cargo

15 commits in 8280633db680dec5bfe1de25156d1a1d53e6d190..750cb1482e4d0e74822cded7ab8b3c677ed8b041
2019-11-11 23:17:05 +0000 to 2019-11-23 23:06:36 +0000
- Some random comments and docstrings. (rust-lang/cargo#7625)
- Add value OUT_DIR to build-script-executed JSON message (rust-lang/cargo#7622)
- Update documentation for custom target dependencies. (rust-lang/cargo#7623)
- Document private items for binary crates by default (rust-lang/cargo#7593)
- Extend documentation on security concerns of crate names in a registry. (rust-lang/cargo#7616)
- Stabilize install-upgrade. (rust-lang/cargo#7560)
- Turn the new lock file format on by default (rust-lang/cargo#7579)
- bump im-rc version (rust-lang/cargo#7609)
- Ignore file lock errors if unsupported, on Windows (rust-lang/cargo#7602)
- Add hack for fwdansi change. (rust-lang/cargo#7607)
- Document Cargo's JSON output. (rust-lang/cargo#7595)
- Remove "cargo login" from user input when asking for login token. (rust-lang/cargo#7588)
- Fix all Clippy suggestions (but not add it to CI 🙃) (rust-lang/cargo#7574)
- Add kind/platform info to `cargo metadata` (rust-lang/cargo#7132)
- Update core-foundation requirement from 0.6.0 to 0.7.0 (rust-lang/cargo#7585)

## reference

2 commits in 45558c4..9e843ae
2019-11-08 14:47:35 +0100 to 2019-11-24 17:44:04 +0100
- Minor never type additions. (rust-lang/reference#723)
- Update associated-items.md.  "it"-&gt;is (rust-lang/reference#721)

## book

3 commits in e79dd62aa63396714278d484d91d48826737f47f..81ebaa2a3f88d4d106516c489682e64cacba4f60
2019-10-30 07:33:12 -0500 to 2019-11-15 08:30:04 -0800
- small fix ch04-03 & code block typo ch07-02 (rust-lang/book#2138)
- Adapt content of Chapter 16.3 in order to be consistent with improved compiler message (rust-lang/book#1779)
- [Rust 1.35] Remove FnBox and use builtin impl FnOnce for Box&lt;FnOnce()&gt; instead. (rust-lang/book#1906)

## rls

3 commits in 5db91c7b94ca81eead6b25bcf6196b869a44ece0..9ec2b8cb57c87517bcb506ac302eae339ffa2025
2019-10-30 16:04:39 +0100 to 2019-11-24 23:16:11 +0100
- Fix test for latest nightly. (rust-lang/rls#1595)
- doc: contributing: Remove outdated LSP extension (rust-lang/rls#1594)
- Update cargo. (rust-lang/rls#1591)

## rust-by-example

1 commits in dcee312c66267eb5a2f6f1561354003950e29105..4835e025826729827a94fdeb7cb85fed288d08bb
2019-10-31 11:26:53 -0300 to 2019-11-14 09:20:43 -0300
- crates: fix suggested value for --crate-type flag (rust-lang/rust-by-example#1292)

## edition-guide

1 commits in f553fb26c60c4623ea88a1cfe731eafe0643ce34..6601cab4666596494a569f94aa63b7b3230e9769
2019-10-30 08:27:42 -0500 to 2019-11-22 12:08:58 -0500
- Remove final nursery reference
@carols10cents carols10cents mentioned this pull request Jan 6, 2020
Closed
@carols10cents carols10cents mentioned this pull request Jan 20, 2020
Merged
@jszopi jszopi mentioned this pull request Jan 26, 2022
Merged
carols10cents pushed a commit that referenced this pull request Jan 27, 2022
@jszopi @carols10cents
Ch20-02 Remove reference to a long-gone "trick"
95b5e7c 
In #1906, a workaround involving `FnBox` was removed, but the paragraph
after still makes a reference to a "trick".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@L0uisc L0uisc L0uisc left review comments

@steveklabnik steveklabnik steveklabnik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
ch20
Development

Successfully merging this pull request may close these issues.
6 participants
@crlf0710 @L0uisc @carols10cents @UnHumbleBen @steveklabnik @runiq