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 5 pull requests #71966

Closed
wants to merge 20 commits into from

Commits on May 6, 2020

  1. Configuration menu
    Copy the full SHA
    3cf5569 View commit details
    Browse the repository at this point in the history
  2. Add test for rust-lang#29988

    JohnTitor committed May 6, 2020
    Configuration menu
    Copy the full SHA
    96d4e0b View commit details
    Browse the repository at this point in the history
  3. Add test for rust-lang#34979

    JohnTitor committed May 6, 2020
    Configuration menu
    Copy the full SHA
    be2d553 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f22bc7b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8e76663 View commit details
    Browse the repository at this point in the history
  6. grammar: which vs that

    jsoref authored May 6, 2020
    Configuration menu
    Copy the full SHA
    6425413 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    39b5b70 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5f54ce7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c8aba78 View commit details
    Browse the repository at this point in the history
  10. grammar: noun not verb

    jsoref authored May 6, 2020
    Configuration menu
    Copy the full SHA
    488e660 View commit details
    Browse the repository at this point in the history
  11. grammar: stray comma

    jsoref authored May 6, 2020
    Configuration menu
    Copy the full SHA
    5d2d7e7 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    eb12784 View commit details
    Browse the repository at this point in the history
  13. grammar: dealing-with

    jsoref authored May 6, 2020
    Configuration menu
    Copy the full SHA
    6c8c3f8 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Configuration menu
    Copy the full SHA
    186a170 View commit details
    Browse the repository at this point in the history
  2. Fix embarassing error

    jcotton42 committed May 7, 2020
    Configuration menu
    Copy the full SHA
    7204fe4 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#71783 - estebank:async-block-2015, r=tmandry

    Detect errors caused by `async` block in 2015 edition
    
    Fix rust-lang#67204.
    Dylan-DPC authored May 7, 2020
    Configuration menu
    Copy the full SHA
    180c4fd View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#71952 - JohnTitor:add-tests, r=Dylan-DPC

    Add some regression tests
    
    Closes rust-lang#29988
    Closes rust-lang#34979
    Pick up two snippets that have been fixed from rust-lang#67945 (shouldn't be closed yet!)
    Dylan-DPC authored May 7, 2020
    Configuration menu
    Copy the full SHA
    2c49d0a View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#71959 - petrochenkov:chelpers, r=Mark-Simul…

    …acrum
    
    tests: Fix warnings in `rust_test_helpers.c`
    
    MSVC is silly and doesn't recognize `assert` as diverging.
    Dylan-DPC authored May 7, 2020
    Configuration menu
    Copy the full SHA
    88e141e View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#71962 - jsoref:grammar, r=Dylan-DPC

    Grammar
    
    I've split this into individual changes so that people can veto individually. I'm not attached to most of them.
    
    `zeroes` vs. `zeros` is why I took the effort to run this through app.grammarly (which disappointingly didn't even notice).
    Dylan-DPC authored May 7, 2020
    Configuration menu
    Copy the full SHA
    1609451 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#71964 - jcotton42:bootstrap_decode_none_win…

    …dows, r=Mark-Simulacrum
    
    Fix bootstrap failing on win32
    
    ```powershell
    python x.py -h # or really any x.py command
    ```
    would fail with
    ```
    info: Downloading and building bootstrap before processing --help
          command. See src/bootstrap/README.md for help with common
          commands.
    Updating only changed submodules
    Submodules updated in 0.15 seconds
    Traceback (most recent call last):
      File "x.py", line 11, in <module>
        bootstrap.main()
      File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 960, in main
        bootstrap(help_triggered)
      File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 925, in bootstrap
        build.build = args.build or build.build_triple()
      File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 731, in build_triple
        return default_build_triple()
      File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 184, in default_build_triple
        ostype = require(["uname", "-s"], exit=required).decode(default_encoding)
    AttributeError: 'NoneType' object has no attribute 'decode'
    ```
    
    This PR defers the `decode` call until after we're sure `ostype` and `cputype` are not `None`, as they would be on Windows since `uname` doesn't exist
    Dylan-DPC authored May 7, 2020
    Configuration menu
    Copy the full SHA
    9b37d94 View commit details
    Browse the repository at this point in the history