Skip to content

Rollup of PRs in the queue; Tuesday#24156

Merged
bors merged 18 commits into
rust-lang:masterfrom
Manishearth:rollup
Apr 7, 2015
Merged

Rollup of PRs in the queue; Tuesday#24156
bors merged 18 commits into
rust-lang:masterfrom
Manishearth:rollup

Conversation

@Manishearth

Copy link
Copy Markdown
Member

No description provided.

callahad and others added 17 commits April 3, 2015 22:48
Fixes rust-lang#24030

Of the four code samples with modules in TRPL:

    - 2 use `mod test`
    - 2 use `mod tests`

We should be consistent here, but which is right? The stdlib is split:

    $ grep -r 'mod tests {' src/lib* | wc -l
          63
    $ grep -r 'mod test {'  src/lib* | wc -l
          58

Subjectively, I like the plural, but both the language reference and the
style guide recommend the singular. So we'll go with that here, for now.
traits.md said:

If we add a `use` line right above `main` and make the right things public,
everything is fine:

However, the use line was actually placed at the top of the file instead.  Move
the use line to right above main.  That also makes the example more evocative
of cases where the module is defined in a separate file.
There is no `read_string` function, and `lines` never returns an error.
 Fixes rust-lang#24030

Of the four code samples with modules in TRPL:

    - 2 use `mod test`
    - 2 use `mod tests`

We should be consistent here, but which is right? The stdlib is split:

    $ grep -r 'mod tests {' src/lib* | wc -l
          63
    $ grep -r 'mod test {'  src/lib* | wc -l
          58

Subjectively, I like the plural, but both the language reference and the
style guide recommend the singular. So we'll go with that here, for now.

r? @steveklabnik
…a-docs, r=huon

 This probably needs a bit more work, but I wanted to try and capture some common use cases and be a bit more helpful.

r? @huonw
cc @steveklabnik
 traits.md said:

If we add a `use` line right above `main` and make the right things public,
everything is fine:

However, the use line was actually placed at the top of the file instead.  Move
the use line to right above main.  That also makes the example more evocative
of cases where the module is defined in a separate file.
 * Fix broken \"module-level documentation\" link on the [`trait Any` docs](http://doc.rust-lang.org/std/any/trait.Any.html) and related broken markup on the [`std::any` docs](http://doc.rust-lang.org/std/any/index.html).

* Remove an outdated or incorrect notice in the `BufRead::lines` docs. There is no such `read_string` function, and `lines` never returns an error.

r? @steveklabnik
@Manishearth

Copy link
Copy Markdown
Member Author

@bors: r+ p=20 force

@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit b3bcbb1 has been approved by Manishearth

@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b3bcbb1 with merge 275e342...

@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-32-opt

@Manishearth

Copy link
Copy Markdown
Member Author

@bors: r+ p=20 force

@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit ae64d8e has been approved by Manishearth

@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ae64d8e with merge 1fd89b6...

bors added a commit that referenced this pull request Apr 7, 2015
@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

@bors bors merged commit ae64d8e into rust-lang:master Apr 7, 2015
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants