Merged
Conversation
…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.
…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.
Bump libgit2 dependencies Brings in rust-lang/git2-rs#527 Closes rust-lang#7466 Closes rust-lang#7988
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
Contributor
Author
Contributor
Author
|
I also considered instead of backporting #7996 to revert #7939. I don't feel strongly one way or the other. The latest libgit2 probably hasn't had much testing done, but presumably there were some important fixes in the newer versions. This will require a coordinated update with clippy due to the git2 changes ("links" restriction), which I'll try to handle. |
Member
|
@bors: r+ I think updating a bit further for git2 is fine |
Contributor
|
📌 Commit fb5abcd has been approved by |
Contributor
Contributor
|
☀️ Test successful - checks-azure |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
debug_assertionsincfgexpressions.