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

1.43 beta backports #8007

Merged
merged 3 commits into from
Mar 17, 2020
Merged

1.43 beta backports #8007

merged 3 commits into from
Mar 17, 2020

Commits on Mar 16, 2020

  1. Auto merge of rust-lang#7970 - ehuss:revert-debug-assert-filter, r=al… 

    …excrichton

Partially revert change to filter debug_assertions.

This partially reverts the changes from rust-lang#7943. It caused a regression with the rocket_contrib crate. I knew that was the only crate that had a `cfg(debug_assertions)` dependency, and I saw that it had been fixed, but I did not realize the fix hadn't been published (and will be in a semver incompatible release).

This retains the old behavior for `cfg(debug_assertions)` of issuing a warning. I kept the filter for `CARGO_CFG_DEBUG_ASSERTIONS` for build scripts because that was the original intent for the change, and I don't see anyone using that.

Closes rust-lang#7966.
    @bors @ehuss
    bors authored and ehuss committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    a62dc84 View commit details
    Browse the repository at this point in the history

  2. Auto merge of rust-lang#7983 - ehuss:fix-old-manifest-anchors, r=alex… 

    …crichton

Support old html anchors in manifest chapter.

rust-lang#7733 unintentionally broke some old HTML anchors in the manifest chapter.  This would cause any links out in the wild to not scroll to the correct position.

Unfortunately it is too late for the 1.42 release.  However, I'd like to backport this for 1.43.
    @bors @ehuss
    bors authored and ehuss committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    f900cd4 View commit details
    Browse the repository at this point in the history

  3. Auto merge of rust-lang#7996 - alexcrichton:update-git2, r=Eh2406 

    Bump libgit2 dependencies

Brings in rust-lang/git2-rs#527

Closes rust-lang#7466
Closes rust-lang#7988
    @bors @ehuss
    bors authored and ehuss committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    fb5abcd View commit details
    Browse the repository at this point in the history