-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Update TRPL to add new Chapter 17: Async and Await #131859
base: master
Are you sure you want to change the base?
Conversation
|
This comment has been minimized.
This comment has been minimized.
All right, this is going to be fun to sort out. 😂 In the book crate, the CI run explicitly handles making sure |
I'm not quite sure I understand, but I don't see a problem depending on tokio in this repo. It's in the lock file already: Line 5332 in d9c4b8d
|
@Noratrieb Oh, well, that definitely simplifies things a bit then! I had missed that it was there. I just didn’t want to go adding it needlessly, given it is large! We do depend on a specific version in the book repo, but I think that will probably be Fine™ once I get the other bits around the build pipeline sorted out. Long story short: For the new chapter on async, we built a small crate, I am currently digging into the spot we invoke (That said, if people have better suggestions on how to do this here, I am all ears!) |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
a242ded
to
b71d6b9
Compare
This comment has been minimized.
This comment has been minimized.
Another thing we should probably include here is to add trpl as an unused dependency in Let me know if you run into any major roadblocks. I dropped the book update from #132007. |
b71d6b9
to
da710c8
Compare
This comment has been minimized.
This comment has been minimized.
da710c8
to
206b688
Compare
This comment has been minimized.
This comment has been minimized.
206b688
to
358f14b
Compare
The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging. |
This comment has been minimized.
This comment has been minimized.
358f14b
to
76f6be9
Compare
This comment has been minimized.
This comment has been minimized.
76f6be9
to
e4c2b0f
Compare
This comment has been minimized.
This comment has been minimized.
e4c2b0f
to
0290c20
Compare
This comment has been minimized.
This comment has been minimized.
872291b
to
453ec93
Compare
This comment has been minimized.
This comment has been minimized.
453ec93
to
fe9e461
Compare
This comment has been minimized.
This comment has been minimized.
fe9e461
to
d9ab7db
Compare
d9ab7db
to
1108877
Compare
This comment has been minimized.
This comment has been minimized.
e4ec5f7
to
1c09e2d
Compare
This comment has been minimized.
This comment has been minimized.
1c09e2d
to
b8a9f6c
Compare
This comment has been minimized.
This comment has been minimized.
b8a9f6c
to
225fbb3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bootstrap side looks good to me, thanks!
Thanks, @onur-ozkan! @cjgillot, I think this is ready for your eyes when you get a bit! |
This also incorporates a number of other changes and fixes which would normally have been part of the automatic update, but which were blocked from landing because of the changes required to support shipping a crate as part of the chapter, along with those changes.
With the insertion of a new chapter 17 on async and await to _The Rust Programming Language_, references in compiler output to later chapters need to be updated to avoid confusing users. Redirects exist so that users who click old links will end up in the right place anyway, but this way users will be directed to the right URL in the first place.
This makes it possible to test an mdbook which has dependencies other than the direct crate for the book itself, e.g. the `trpl` crate used in _The Rust Programming Language_.
Since TRPL now depends on a `trpl` crate, the test needs to be able to build that crate to run mdbook against it, and also to invoke mdbook with `--library-path` in that case. Use the support for that flag added to `rustbook` in the previous change to invoke it with the path to the dependencies it will need to run `rustdoc` tests which reference `trpl`. Co-authored-by: Onur Özkan <[email protected]>
225fbb3
to
71d9ad3
Compare
rustbook
to pass through the-L
/--library-path
flag tomdbook
so that references to thetrpl
cratetrpl
crate as part of the book tests. Make it straightforward to add other such book dependencies in the future if needed by implementing that in a fairly general way.