Skip to content

Divide items and expressions into sections #100

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

Merged
merged 1 commit into from
Oct 2, 2017

Conversation

brauliobz
Copy link
Contributor

  • Rendered

  • To concat items.md for comparison purposes:

cat src/items.md src/items/{modules,extern-crates,use-declarations,functions,type-aliases,structs,enumerations,unions,constant-items,static-items,traits,implementations,external-blocks}.md > src/items.new.md

  • To concat expressions.md for comparison purposes:

cat src/expressions.md src/expressions/{literal-expr,path-expr,tuple-expr,struct-expr,enum-variant-expr,block-expr,method-call-expr,field-expr,call-expr,closure-expr,array-expr,range-expr,operator-expr,loop-expr,if-expr,match-expr,return-expr}.md > src/expressions.new.md

  • The following sections were moved inside others and won't match in the diff above: grouped expressions, while let, if let, tuple indexing.

  • I (hopefully) fixed all affected links.

@Havvy
Copy link
Contributor

Havvy commented Sep 23, 2017

@steveklabnik @QuietMisdreavus @GuillaumeGomez @frewsxcv

This is a relatively major structural change. I'm not sure how to do the checkbox thingy - so, are you all good with this change?

I think it's a good change personally.

@frewsxcv
Copy link
Member

Sounds good to me, though I have a feeling we'll need to update links in the Rust repository as well, maybe also nomicon

@brauliobz brauliobz force-pushed the section_the_sections branch 2 times, most recently from c866a13 to 8000318 Compare September 23, 2017 17:08
@brauliobz
Copy link
Contributor Author

A rg 'reference/(items|expressions).html#' on Rust repo (with all submodules fetched) returns only 4 results:

rust/src/librustc_typeck/diagnostics.rs
793:[Expressions]: https://doc.rust-lang.org/reference/expressions.html#lvalues-rvalues-and-temporaries

rust/src/libcore/ops/deref.rs
43:/// [ref-deref-op]: ../../reference/expressions.html#the-dereference-operator
130:/// [ref-deref-op]: ../../reference/expressions.html#the-dereference-operator

rust/src/libcore/ops/mod.rs
153://! [operator precedence]: ../../reference/expressions.html#operator-precedence

I didn't find any links on nomicon and rust-by-example.

@Havvy Havvy self-requested a review October 2, 2017 02:56
@Havvy
Copy link
Contributor

Havvy commented Oct 2, 2017

We need coordination with the stdlib docs to update things properly. I don't know how to do the coordination required here.

@frewsxcv
Copy link
Member

frewsxcv commented Oct 2, 2017

We need coordination with the stdlib docs to update things properly. I don't know how to do the coordination required here.

The approach is to merge this first, then bump the git submodule in rust-lang/rust in a follow-up PR.

@brauliobz FYI, looks like there's merge conflicts here

- Links in other parts of the reference were updated
- The following sections were moved inside others:
  * grouped expressions into operator-expr.md
  * while let into loop-expr.md
  * if let into if-expr.md
  * tuple indexing into tuple-expr.md
@brauliobz brauliobz force-pushed the section_the_sections branch from 8000318 to ae361e1 Compare October 2, 2017 12:00
@steveklabnik
Copy link
Member

Yup, going to do that right now. Thanks!

@steveklabnik steveklabnik merged commit d5a1557 into rust-lang:master Oct 2, 2017
@brauliobz brauliobz deleted the section_the_sections branch October 2, 2017 15:21
@steveklabnik
Copy link
Member

FWIW this also did break inter-reference stuff:

reference\expressions\field-expr.html:149: broken link fragment `#method-call-expressions` pointing to `reference\expres
sions\field-expr.html`
reference\expressions\path-expr.html:150: broken link fragment `#unsafe-blocks` pointing to `reference\expressions\path-
expr.html`
reference\interior-mutability.html:149: broken link fragment `#shared-references` pointing to `reference\types.html`
reference\interior-mutability.html:161: broken link - std\sync\atomic.html

I'm fixing it though 😄

steveklabnik added a commit that referenced this pull request Oct 2, 2017
steveklabnik added a commit that referenced this pull request Oct 2, 2017
@brauliobz
Copy link
Contributor Author

I'm fixing it though 😄

Thanks!

@steveklabnik
Copy link
Member

steveklabnik commented Oct 2, 2017 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants