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.

Sign up for GitHub

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

Jump to bottom

Rollup of 5 pull requests #71579

Merged
merged 14 commits into from
Apr 26, 2020
Merged

Rollup of 5 pull requests #71579

merged 14 commits into from
Apr 26, 2020

Commits on Apr 26, 2020

  1. fix more clippy warnings 

    clippy::{redundant_pattern_matching, clone_on_copy, iter_cloned_collect, option_as_ref_deref, match_ref_pats}
    @matthiaskrgr
    matthiaskrgr committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    8862f82 View commit details
    Browse the repository at this point in the history

  2. rustc_target: Stop using "string typing" for relocation models 

    Introduce `enum RelocModel` instead.
    @petrochenkov
    petrochenkov committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    fb91e5e View commit details
    Browse the repository at this point in the history

  3. codegen_llvm: RelocMode -> RelocModel

    @petrochenkov
    petrochenkov committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    0452725 View commit details
    Browse the repository at this point in the history

  4. codegen_llvm: Simplify logic for relaxing PIC into PIE

    @petrochenkov
    petrochenkov committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    76d85de View commit details
    Browse the repository at this point in the history

  5. rustc-book: Document -C relocation-model

    @petrochenkov
    petrochenkov committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    a4199b4 View commit details
    Browse the repository at this point in the history

  6. tests: Remove unnecessary -C relocation-model=dynamic-no-pics 

    The referenced `sanitizer-address/Makefile` no longer exists, so perhaps these options are no longer necessary as well.
Even if they are still necessary, they should use `-C relocation-model=static` instead.
    @petrochenkov
    petrochenkov committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    45fbe8f View commit details
    Browse the repository at this point in the history

  7. Fix since attribute for nonzero_bitor impl's

    @jplatte
    jplatte committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    4589bd5 View commit details
    Browse the repository at this point in the history

  8. proc_macro: Fix since attributes for new Span methods

    @jplatte
    jplatte committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    b681789 View commit details
    Browse the repository at this point in the history

  9. Fix stable(since) attribute for BTreeMap::remove_entry

    @jplatte
    jplatte committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    35eae4b View commit details
    Browse the repository at this point in the history

  10. Rollup merge of rust-lang#71490 - petrochenkov:passcheck2, r=davidtwco 

    Cleanup and document `-C relocation-model`

As the title says, this is mostly a refactoring and documentation.

One potentially observable change here is that `-C relocation-model=default` now takes the default from the Rust target, rather than from the underlying LLVM target. In other words, `-C relocation-model=default` is now equivalent to not specifying the relocation model on command line at all.
Apparently no one used that option because it has other bugs as well, e.g. PIC `default` wasn't treated as PIC in some places.
    @Dylan-DPC
    Dylan-DPC committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    96c1bb5 View commit details
    Browse the repository at this point in the history

  11. Rollup merge of rust-lang#71562 - matthiaskrgr:cl7ppy, r=Dylan-DPC 

    fix more clippy warnings

clippy::{redundant_pattern_matching, clone_on_copy, iter_cloned_collect, option_as_ref_deref, match_ref_pats}

r? @Dylan-DPC
    @Dylan-DPC
    Dylan-DPC committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    3b3f7bd View commit details
    Browse the repository at this point in the history

  12. Rollup merge of rust-lang#71571 - jplatte:patch-1, r=jonas-schievink 

    Fix since attribute for nonzero_bitor impl's

Added in rust-lang#69813, took a while to merge so the since attributes went out of date.
    @Dylan-DPC
    Dylan-DPC committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    4a9b976 View commit details
    Browse the repository at this point in the history

  13. Rollup merge of rust-lang#71574 - jplatte:patch-2, r=petrochenkov 

    proc_macro: Fix since attributes for new Span methods

Added in rust-lang#69041, took a while to merge so the since attributes went out of date.
    @Dylan-DPC
    Dylan-DPC committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    aa89e91 View commit details
    Browse the repository at this point in the history

  14. Rollup merge of rust-lang#71575 - jplatte:patch-4, r=Mark-Simulacrum 

    Fix stable(since) attribute for BTreeMap::remove_entry

Stabilized in rust-lang#70712.

Maybe checking that the since attributes are added correctly should be automated through tidy? This is the third PR I'm opening that fixes a stable(since) attribute for something meant to be stabilized in 1.43 / 1.44 initially but then only stabilized in 1.45. (the other two are rust-lang#71571, rust-lang#71574)
    @Dylan-DPC
    Dylan-DPC committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    aa9dc69 View commit details
    Browse the repository at this point in the history