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.

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

Rollup of 6 pull requests #24169

Merged
merged 31 commits into from
Apr 7, 2015
Merged

Rollup of 6 pull requests #24169

merged 31 commits into from
Apr 7, 2015

Commits on Apr 4, 2015

  1. book: use mod test consistently

    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.
    callahad committed Apr 4, 2015
    Configuration menu
    Copy the full SHA
    cb1e6a2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48a023c View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2015

  1. Configuration menu
    Copy the full SHA
    92d0026 View commit details
    Browse the repository at this point in the history
  2. Fix tests

    nikomatsakis committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    49f2a56 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d166772 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3b9847e View commit details
    Browse the repository at this point in the history
  5. traits.md: Fix example of using traits to match description

    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.
    joshtriplett committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    59d8898 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8fcc5bd View commit details
    Browse the repository at this point in the history
  7. Remove outdated notice from BufRead::lines docs.

    There is no `read_string` function, and `lines` never returns an error.
    mbrubeck committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    6e86c63 View commit details
    Browse the repository at this point in the history
  8. use normative source for Grapheme class data

    @mahkoh points out in rust-lang#15628 that unicode.py does not use
    normative data for Grapheme classes. This pr fixes that issue.
    
    In addition, GC_RegionalIndicator is renamed GC_Regional_Indicator
    in order to stay in line with the Unicode class name definitions.
    I have updated refs in u_str.rs, and verified that there are no
    refs elsewhere in the codebase. However, in principle someone
    using the unicode tables for their own purposes might see breakage
    from this.
    kwantam committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    bef00ab View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2015

  1. Update intro.md

    Use HTTPS where possible to avoid plaintext HTTP connections.
    xfq committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    600101b View commit details
    Browse the repository at this point in the history
  2. Add test for rust-lang#22560

    lgrz committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    7eb723d View commit details
    Browse the repository at this point in the history
  3. Update hello-world.md

    People use programming language *implementations* like Ruby MRI, CPython, and SpiderMonkey for executing programs.
    xfq committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    6eea426 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fc2494b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6f9ec06 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4dd6edd View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#24042 - callahad:bug_24030, r=steveklabnik

     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
    Manishearth committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    4faf0be View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    daf2e36 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#24059 - nikomatsakis:issue-22914-phantomdat…

    …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
    Manishearth committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    6f852f5 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    50cb31f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6efb835 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#24112 - joshtriplett:patch-1, r=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.
    Manishearth committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    322e4a1 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#24113 - mbrubeck:doc-edit, r=steveklabnik

     * 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 committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    b3bcbb1 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    ae64d8e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    1fd89b6 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#24132 - kwantam:master, r=alexcrichton

    @mahkoh points out in rust-lang#15628 that unicode.py does not use
    normative data for Grapheme classes. This pr fixes that issue,
    and does some minor cleanup of the unicode.py script.
    
    In addition, GC_RegionalIndicator is renamed GC_Regional_Indicator
    in order to stay in line with the Unicode class name definitions.
    I have updated refs in u_str.rs, and verified that there are no
    refs elsewhere in the codebase. However, in principle someone
    using the unicode tables for their own purposes might see breakage
    from this.
    Manishearth committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    7b2e118 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#24139 - xfq:patch-1, r=steveklabnik

    Use HTTPS where possible to avoid plaintext HTTP connections.
    Manishearth committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    6295406 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    2b34643 View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#24148 - xfq:patch-2, r=steveklabnik

    People use programming language *implementations* like Ruby MRI, CPython, and SpiderMonkey for executing programs.
    Manishearth committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    fe2cff7 View commit details
    Browse the repository at this point in the history
  20. Rollup merge of rust-lang#24150 - wg:master, r=alexcrichton

    This fix allows the gdb debuginfo tests to pass on FreeBSD when using the newer 7.8 package.
    Manishearth committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    c4bd1c2 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    4e067f5 View commit details
    Browse the repository at this point in the history