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 #52574

Merged
merged 15 commits into from
Jul 21, 2018
Merged

Rollup of 7 pull requests #52574

merged 15 commits into from
Jul 21, 2018

Commits on Jul 18, 2018

  1. rustc: Remove a workaroudn in ThinLTO fixed upstream

    This commit removes a hack in our ThinLTO passes which removes available
    externally functions manually. The [upstream bug][1] has long since been fixed,
    so we should be able to rely on LLVM natively for this now!
    
    [1]: https://bugs.llvm.org/show_bug.cgi?id=35736
    alexcrichton committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    829bc26 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. Configuration menu
    Copy the full SHA
    16c0572 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0700558 View commit details
    Browse the repository at this point in the history
  3. rustc: Fix two custom attributes with custom derive

    This commit fixes an issue where multiple custom attributes could not be fed
    into a custom derive in some situations with the `use_extern_macros` feature
    enabled. The problem was that the macro expander didn't consider that it was
    making progress when we were deducing that attributes should be lumped in with
    custom derive invocations.
    
    The fix applied here was to track in the expander if our attribute is changing
    (getting stashed away elsewhere and replaced with a new invocation). If it is
    swapped then it's considered progress, otherwise behavior should remain the
    same.
    
    Closes rust-lang#52525
    alexcrichton committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    f2f7ab9 View commit details
    Browse the repository at this point in the history
  4. Fix docker/run.sh script when run locally

    Switch a `mkdir $foo` to `mkdir -p $foo` to handle the case that this script is
    being run locally and has previously executed.
    alexcrichton committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    f775c6d View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. Remove duplicate E0396 tests

    ljedrz committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    576cfc5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7cab813 View commit details
    Browse the repository at this point in the history
  3. Remove unused method

    oli-obk committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    c7d39e0 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#52502 - RalfJung:rotate, r=scottmcm

    fix unsafety: don't call ptr_rotate for ZST
    
    `rotate::ptr_rotate` has a comment saying
    ```
    /// # Safety
    ///
    /// The specified range must be valid for reading and writing.
    /// The type `T` must have non-zero size.
    ```
    So we better make sure we don't call it on ZST...
    
    Cc @scottmcm (author of rust-lang#41670)
    kennytm committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    c74ff6c View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#52505 - alexcrichton:remove-thinlto-hack, r…

    …=nikomatsakis
    
    rustc: Remove a workaround in ThinLTO fixed upstream
    
    This commit removes a hack in our ThinLTO passes which removes available
    externally functions manually. The [upstream bug][1] has long since been fixed,
    so we should be able to rely on LLVM natively for this now!
    
    [1]: https://bugs.llvm.org/show_bug.cgi?id=35736
    kennytm committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    9a273a3 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#52526 - ljedrz:cleanup_18800, r=alexcrichton

    Enable run-pass/sepcomp-lib-lto.rs on Android
    
    rust-lang#18800 is fixed, so it should be safe to restore this test.
    kennytm committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    1ed1b13 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#52527 - ljedrz:cleanup_13973, r=oli-obk

    Remove duplicate E0396 tests
    
    Resolves FIXME rust-lang#13973 (erroneously marked as rust-lang#13972). A test for E0396 already exists in `test/ui/const-deref-ptr.rs`.
    kennytm committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    63da812 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#52539 - alexcrichton:two-attrs, r=petrochenkov

    rustc: Fix two custom attributes with custom derive
    
    This commit fixes an issue where multiple custom attributes could not be fed
    into a custom derive in some situations with the `use_extern_macros` feature
    enabled. The problem was that the macro expander didn't consider that it was
    making progress when we were deducing that attributes should be lumped in with
    custom derive invocations.
    
    The fix applied here was to track in the expander if our attribute is changing
    (getting stashed away elsewhere and replaced with a new invocation). If it is
    swapped then it's considered progress, otherwise behavior should remain the
    same.
    
    Closes rust-lang#52525
    kennytm committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    863ed13 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#52540 - alexcrichton:tweak-script, r=kennytm

    Fix docker/run.sh script when run locally
    
    Switch a `mkdir $foo` to `mkdir -p $foo` to handle the case that this script is
    being run locally and has previously executed.
    kennytm committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    a9a4f06 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7bf3578 View commit details
    Browse the repository at this point in the history