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 7 pull requests #63228

Merged
merged 24 commits into from
Aug 3, 2019
Merged

Rollup of 7 pull requests #63228

merged 24 commits into from
Aug 3, 2019

Commits on Jul 30, 2019

  1. On format!() arg count mismatch provide extra info

    When positional width and precision formatting flags are present in a
    formatting string that has an argument count mismatch, provide extra
    information pointing at them making it easiser to understand where the
    problem may lay:
    
    ```
    error: 4 positional arguments in format string, but there are 3 arguments
      --> $DIR/ifmt-bad-arg.rs:78:15
       |
    LL |     println!("{} {:.*} {}", 1, 3.2, 4);
       |               ^^ ^^--^ ^^      --- this parameter corresponds to the precision flag
       |                    |
       |                    this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
       |
       = note: positional arguments are zero-based
       = note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
    
    error: 4 positional arguments in format string, but there are 3 arguments
      --> $DIR/ifmt-bad-arg.rs:81:15
       |
    LL |     println!("{} {:07$.*} {}", 1, 3.2, 4);
       |               ^^ ^^-----^ ^^      --- this parameter corresponds to the precision flag
       |                    |  |
       |                    |  this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
       |                    this width flag expects an `usize` argument at position 7, but there are 3 arguments
       |
       = note: positional arguments are zero-based
       = note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
    
    error: 3 positional arguments in format string, but there are 3 arguments
      --> $DIR/ifmt-bad-arg.rs:84:15
       |
    LL |     println!("{} {:07$} {}", 1, 3.2, 4);
       |               ^^ ^^---^ ^^
       |                    |
       |                    this width flag expects an `usize` argument at position 7, but there are 3 arguments
       |
       = note: positional arguments are zero-based
       = note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
    ```
    estebank committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    159dcb2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    86f4f68 View commit details
    Browse the repository at this point in the history
  3. review comments

    estebank committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    762f645 View commit details
    Browse the repository at this point in the history
  4. fix tests

    estebank committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    9e59d74 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2019

  1. fix dedup

    estebank committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    22ea38d View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2019

  1. Configuration menu
    Copy the full SHA
    79a1e7a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d8c97b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    30f61de View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2019

  1. Configuration menu
    Copy the full SHA
    14be088 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    875cef0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dd98727 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d1c89d6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    57f9423 View commit details
    Browse the repository at this point in the history
  6. Remove trailing whitespace

    I had one job...
    gnzlbg committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    13b4afe View commit details
    Browse the repository at this point in the history
  7. Consistency.

    gnzlbg committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    3725e35 View commit details
    Browse the repository at this point in the history
  8. remove unsupported test case

    bpangWR committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    208672f View commit details
    Browse the repository at this point in the history
  9. Added support for armv7-unknown-linux-gnueabi and armv7-unknown-linux…

    …-musleabi.
    
    Support for the targets in the compiler and std build in the CI.
    adrian-budau committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    2b0f448 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#63107 - adrian-budau:master, r=alexcrichton

    Added support for armv7-unknown-linux-gnueabi/musleabi
    
    Fixes rust-lang#63101
    
    Some things that are not done and I hope someone can help me with:
    
    * During the ci build of `armv7-unknown-linux-gnueabi` `openssl` must be built (to build cargo) but `openssl` does not yet support this target. This feels slightly like a chicken-and-egg problem, any feedback is welcome.
    * Should I add any tests for any of these targets?
    Centril committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    a2735a3 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#63121 - estebank:formatting-pos, r=alexcric…

    …hton
    
    On `format!()` arg count mismatch provide extra info
    
    When positional width and precision formatting flags are present in a
    formatting string that has an argument count mismatch, provide extra
    information pointing at them making it easiser to understand where the
    problem may lay:
    
    ```
    error: 4 positional arguments in format string, but there are 3 arguments
      --> $DIR/ifmt-bad-arg.rs:78:15
       |
    LL |     println!("{} {:.*} {}", 1, 3.2, 4);
       |               ^^ ^^--^ ^^      --- this parameter corresponds to the precision flag
       |                    |
       |                    this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
       |
       = note: positional arguments are zero-based
       = note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
    
    error: 4 positional arguments in format string, but there are 3 arguments
      --> $DIR/ifmt-bad-arg.rs:81:15
       |
    LL |     println!("{} {:07$.*} {}", 1, 3.2, 4);
       |               ^^ ^^-----^ ^^      --- this parameter corresponds to the precision flag
       |                    |  |
       |                    |  this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
       |                    this width flag expects an `usize` argument at position 7, but there are 3 arguments
       |
       = note: positional arguments are zero-based
       = note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
    
    error: invalid reference to positional argument 7 (there are 3 arguments)
      --> $DIR/ifmt-bad-arg.rs:84:18
       |
    LL |     println!("{} {:07$} {}", 1, 3.2, 4);
       |                  ^^^--^
       |                     |
       |                     this width flag expects an `usize` argument at position 7, but there are 3 arguments
       |
       = note: positional arguments are zero-based
       = note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
    ```
    
    Fix rust-lang#49384.
    Centril committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    edc846f View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#63196 - RalfJung:build_helper, r=alexcrichton

    build_helper: try less confusing method names
    
    build_helper's `*_silent` methods were likely called that way because they do not print the command being run to stdout. [In the original file this all makes sense](rust-lang@046e687#diff-5c3d6537a43ecae03014e118a7fe3321). But later it also gained `*_suppressed` methods and the difference between `silent` and `suppressed` is far from clear.
    
    So rename `run` (which prints the command being run) to `run_verbose`. Then we can call the methods that just run a command and show its output but nothing extra `run` and `try_run`.
    
    `run_verbose` (formerly `run`) is unused from what I can tell. Should I remove it?
    
    r? @alexcrichton
    Cc @Mark-Simulacrum
    Also see rust-lang#63089 (comment).
    Centril committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    726f39a View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#63206 - BaoshanPang:master, r=alexcrichton

    remove unsupported test case
    
    r? @alexcrichton
    Centril committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    ed7b044 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#63208 - tmandry:issue-62658, r=cramertj

    Round generator sizes to a multiple of their alignment
    
    Fixes rust-lang#62658.
    
    r? @cramertj
    cc @eddyb
    Centril committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    109b21f View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#63212 - Centril:param-attrs-pretty, r=david…

    …twco
    
    Pretty print attributes in `print_arg`
    
    Fixes rust-lang#63210.
    cc rust-lang#60406
    
    r? @petrochenkov
    Centril committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    f6d8977 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#63215 - gnzlbg:patch-6, r=Centril

    Clarify semantics of mem::zeroed
    
    Clarifies the semantics of `mem::zeroed`.
    
    r? @Centril
    
    cc @RalfJung
    Centril committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    4520a39 View commit details
    Browse the repository at this point in the history