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

std: Stabilize and deprecate APIs for 1.13 #36815

Merged
merged 1 commit into from
Oct 3, 2016
Merged

std: Stabilize and deprecate APIs for 1.13 #36815

merged 1 commit into from
Oct 3, 2016

Conversation

alexcrichton
Copy link
Member

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

Deprecated

  • BinaryHeap::push_pop
  • BinaryHeap::replace
  • SipHash13
  • SipHash24
  • SipHasher - use DefaultHasher instead in the std::collections::hash_map
    module

Closes #28147
Closes #34767
Closes #35057
Closes #35070

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@alexcrichton alexcrichton force-pushed the stabilize-1.13 branch 5 times, most recently from ba3cf9c to 1b3eb49 Compare September 29, 2016 03:54
@aturon
Copy link
Member

aturon commented Sep 29, 2016

r=me after fixing tidy failure

@bors
Copy link
Contributor

bors commented Sep 29, 2016

☔ The latest upstream changes (presumably #36818) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton alexcrichton force-pushed the stabilize-1.13 branch 2 times, most recently from c5209c3 to 0cdd570 Compare September 29, 2016 16:27
@alexcrichton alexcrichton added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Sep 29, 2016
@alexcrichton
Copy link
Member Author

@bors: r=aturon

@bors
Copy link
Contributor

bors commented Sep 29, 2016

📌 Commit 0cdd570 has been approved by aturon

@alexcrichton
Copy link
Member Author

@bors: r=aturon

@bors
Copy link
Contributor

bors commented Sep 29, 2016

📌 Commit 546c052 has been approved by aturon

@bors
Copy link
Contributor

bors commented Sep 30, 2016

⌛ Testing commit 546c052 with merge ce57a05...

@bors
Copy link
Contributor

bors commented Sep 30, 2016

💔 Test failed - auto-win-msvc-64-cargotest

@sfackler
Copy link
Member

/me shakes fist at #[deny(warnings)]

alexcrichton added a commit to alexcrichton/cargo that referenced this pull request Sep 30, 2016
@alexcrichton
Allow deprecated use of SipHasher
3af7890 
This type is being deprecated in rust-lang/rust#36815, so allow use of the
deprecated type for now. We can fix this later once new APIs have landed.
@alexcrichton alexcrichton mentioned this pull request Sep 30, 2016
Merged
bors added a commit to rust-lang/cargo that referenced this pull request Sep 30, 2016
@bors
Auto merge of #3142 - alexcrichton:siphash, r=alexcrichton
d8936af 
Allow deprecated use of SipHasher

This type is being deprecated in rust-lang/rust#36815, so allow use of the
deprecated type for now. We can fix this later once new APIs have landed.
@alexcrichton
Copy link
Member Author

@bors: r=aturon

@bors
Copy link
Contributor

bors commented Sep 30, 2016

📌 Commit 7c86a2b has been approved by aturon

@brson brson added the relnotes Marks issues that should be documented in the release notes of the next release. label Sep 30, 2016
@bors
Copy link
Contributor

bors commented Oct 1, 2016

⌛ Testing commit 7c86a2b with merge ec3fc8e...

@bors
Copy link
Contributor

bors commented Oct 1, 2016

💔 Test failed - auto-linux-musl-64-opt

@alexcrichton
std: Stabilize and deprecate APIs for 1.13
10c3134 
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

Closes rust-lang#28147
Closes rust-lang#34767
Closes rust-lang#35057
Closes rust-lang#35070
@alexcrichton
Copy link
Member Author

@bors: r=aturon

@bors
Copy link
Contributor

bors commented Oct 3, 2016

📌 Commit 10c3134 has been approved by aturon

@bors
Copy link
Contributor

bors commented Oct 3, 2016

⌛ Testing commit 10c3134 with merge 7a26aec...

bors added a commit that referenced this pull request Oct 3, 2016
@bors
Auto merge of #36815 - alexcrichton:stabilize-1.13, r=aturon
7a26aec 
std: Stabilize and deprecate APIs for 1.13

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`

Deprecated

* `BinaryHeap::push_pop`
* `BinaryHeap::replace`
* `SipHash13`
* `SipHash24`
* `SipHasher` - use `DefaultHasher` instead in the `std::collections::hash_map`
  module

Closes #28147
Closes #34767
Closes #35057
Closes #35070
@bors
Copy link
Contributor

bors commented Oct 3, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: aturon
Pushing 7a26aec to master...

@bors bors merged commit 10c3134 into rust-lang:master Oct 3, 2016
@bors bors mentioned this pull request Oct 3, 2016
Merged
@mcarton mcarton mentioned this pull request Oct 4, 2016
Merged
@alexcrichton alexcrichton deleted the stabilize-1.13 branch October 6, 2016 18:06
This was referenced Oct 10, 2016
Closed
Closed
@alexcrichton alexcrichton mentioned this pull request Oct 10, 2016
Merged
@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 11, 2016
@dead10ck
Copy link

Is there any plan to split SipHasher into its own crate, for those who specifically want a stable SipHash hasher?

@sfackler
Copy link
Member

sfackler commented Feb 19, 2017 via email

@dead10ck
Copy link

dead10ck commented Feb 19, 2017 •
edited
Loading

I guess I should clarify: since users of SipHasher have, so far, been using an officially published and maintained SipHash implementation, is the Rust team going to publish and maintain an official SipHash crate in the rust-lang GitHub org? Or is the plan just to let the community fill the gap?

@sfackler
Copy link
Member

Is there anything lacking/problematic with https://crates.io/crates/siphasher?

@dead10ck
Copy link

I don't know; I haven't tried it. I just need a stable SipHash implementation, and I'd just like to know how to proceed. If there's going to be an official SipHash crate in the relatively near future, then I'd rather wait for that, but if not, then I can try out the available community crates.

@chritchens chritchens mentioned this pull request Apr 27, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. relnotes Marks issues that should be documented in the release notes of the next release.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@alexcrichton @rust-highfive @aturon @bors @sfackler @dead10ck @brson