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

Unstable Book: update lang_items page and split it #113715

Merged
merged 2 commits into from
Aug 18, 2023
Merged

Unstable Book: update lang_items page and split it #113715

merged 2 commits into from
Aug 18, 2023

Conversation

kadiwa4
Copy link
Contributor

@kadiwa4 kadiwa4 commented Jul 15, 2023 •
edited
Loading

lang_items rendered, start rendered
Closes #110274
Rustonomicon PR: rust-lang/nomicon#413, Rust Book PR: rust-lang/book#3705

A lot of information doesn't belong on the lang_items page. I added a separate page for the start feature and moved some text into the Rustonomicon because the lang_items page should not be a tutorial on how to build a #![no_std] executable.
The list of existing lang items is too long/unstable, so I removed it.

The doctests still don't work. :(

@rustbot
Copy link
Collaborator

rustbot commented Jul 15, 2023

r? @JohnTitor

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. A-lang-item Area: Language items labels Jul 15, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@kadiwa4 kadiwa4 mentioned this pull request Jul 15, 2023
Merged
@carols10cents
Copy link
Member

I realize this is a bit of a deadlock here, but before I merge the book PR, I'd like to know that this PR would get approved if CI were passing, to avoid having to revert the book PR or having an unhelpful link in the book for some amount of time.

Please let me know @JohnTitor !

@bors
Copy link
Contributor

bors commented Aug 4, 2023

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@JohnTitor
Copy link
Member

I realize this is a bit of a deadlock here, but before I merge the book PR, I'd like to know that this PR would get approved if CI were passing, to avoid having to revert the book PR or having an unhelpful link in the book for some amount of time.

@carols10cents Sorry for the delay! Yeah, I'd r+ once the linked PR gets merged :)

@carols10cents
Copy link
Member

Great, thank you! I've merged the book PR.

@kadiwa4
Copy link
Contributor Author

kadiwa4 commented Aug 4, 2023

Can I do a submodule update as part of this PR or do I need to open a separate one?

@ehuss
Copy link
Contributor

ehuss commented Aug 4, 2023

Feel free to update the src/doc/book submodule in this PR if that will help you get unstuck.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@JohnTitor
Copy link
Member

Sorry for the delay! @bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 17, 2023

📌 Commit 0d99f1d has been approved by JohnTitor

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 17, 2023
@cuviper cuviper mentioned this pull request Aug 17, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 18, 2023
@bors
Auto merge of rust-lang#114951 - cuviper:rollup-iitoep5, r=cuviper
9b41190 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#113715 (Unstable Book: update `lang_items` page and split it)
 - rust-lang#114897 (Partially revert rust-lang#107200)
 - rust-lang#114913 (Fix suggestion for attempting to define a string with single quotes)
 - rust-lang#114931 (Revert PR rust-lang#114052 to fix invalid suggestion)
 - rust-lang#114944 (update `thiserror` to version >= 1.0.46)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit cd50556 into rust-lang:master Aug 18, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 18, 2023
@kadiwa4 kadiwa4 deleted the lang_items_doc branch August 20, 2023 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels
A-lang-item Area: Language items S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.

Outdated documentation for feature lang_items
7 participants
@kadiwa4 @rustbot @rust-log-analyzer @carols10cents @bors @JohnTitor @ehuss