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 4 pull requests #42445

Closed
wants to merge 9 commits into from

Commits on Jun 3, 2017

  1. Remove 'elided' from lifetime resolution error

    Removes 'elided' from lifetime resolution errors
    Removes 'elided' from relevant error messaging tests
    stephen-lazaro committed Jun 3, 2017
    Configuration menu
    Copy the full SHA
    7ed771f View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2017

  1. Update transmute size lints.

    Also moves a few transmute tests to UI tests to better test their
    output.
    Mark-Simulacrum committed Jun 4, 2017
    Configuration menu
    Copy the full SHA
    8c005e9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7898f41 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    40f8536 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. doc rewording

    king6cong committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    018722e View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#42304 - Mark-Simulacrum:issue-37157, r=niko…

    …matsakis
    
    Print the two types in the span label for transmute errors.
    
    Fixes rust-lang#37157. I'm not entirely happy with the changes here but overall it's better in my opinion; we certainly avoid the odd language in that issue, which changes to:
    
    ```
    error[E0512]: transmute called with differently sized types: <C as TypeConstructor<'a>>::T (size can vary because of <C as TypeConstructor>::T) to <C as TypeConstructor<'b>>::T (size can vary because of <C as TypeConstructor>::T)
     --> test.rs:8:5
      |
    8 |     ::std::mem::transmute(x)
      |     ^^^^^^^^^^^^^^^^^^^^^ transmuting between <C as TypeConstructor<'a>>::T and <C as TypeConstructor<'b>>::T
    
    error: aborting due to previous error(s)
    ```
    Mark-Simulacrum committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    6836562 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#42415 - stephen-lazaro:Issue29094, r=arielb1

    Remove 'elided' from lifetime resolution error
    
    Removes 'elided' from lifetime resolution errors
    Removes 'elided' from relevant error messaging tests
    
    This PR resolves rust-lang#29094
    
    r? @Mark-Simulacrum
    Mark-Simulacrum committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    f99a07d View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#42429 - venkatagiri:llvm_config, r=alexcric…

    …hton
    
    rustc_llvm: re-run build script if config.toml changes
    
    closes rust-lang#35199
    Mark-Simulacrum committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    42ec597 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fd48c3a View commit details
    Browse the repository at this point in the history