Skip to content

Backporting PRs to beta - #37080

Merged
brson merged 10 commits into
rust-lang:betafrom
alexcrichton:beta-next
Oct 11, 2016
Merged

Backporting PRs to beta #37080
brson merged 10 commits into
rust-lang:betafrom
alexcrichton:beta-next

Conversation

brsonand others added 4 commits October 10, 2016 16:04
This commit is intended to be backported to the 1.13 branch, and works with the
following APIs:
Stabilized
* `i32::checked_abs`
* `i32::wrapping_abs`
* `i32::overflowing_abs`
* `RefCell::try_borrow`
* `RefCell::try_borrow_mut`
* `DefaultHasher`
* `DefaultHasher::new`
* `DefaultHasher::default`
Deprecated
* `BinaryHeap::push_pop`
* `BinaryHeap::replace`
* `SipHash13`
* `SipHash24`
* `SipHasher` - use `DefaultHasher` instead in the `std::collections::hash_map`
module
Closesrust-lang#28147Closesrust-lang#34767Closesrust-lang#35057Closesrust-lang#35070
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive

Copy link
Copy Markdown
Contributor

warningWarningwarning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@alexcrichton

Copy link
Copy Markdown
MemberAuthor

r? @brson

nikomatsakisand others added 6 commits October 11, 2016 12:22
The collector was asserting a total absence of projections, but some
projections are expected, even in trans: in particular, projections
containing higher-ranked regions, which we don't currently normalize.
that made no sense (see test), and was incompatible with borrowck.
Fixesrust-lang#36936.
@brson
brson merged commit 94158fe into rust-lang:betaOct 11, 2016
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@alexcrichton@rust-highfive@brson@nikomatsakis@pnkfelix@arielb1@michaelwoerister