diff options
| author | bors <bors@rust-lang.org> | 2020-06-25 12:43:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-25 12:43:50 +0000 |
| commit | 9f3c96b869b48ecd0bb556c6ad9cd603b4dacfb9 (patch) | |
| tree | 2db86ae6273e5e966c66f2891ca26cf89b8f6e11 /src/liballoc | |
| parent | 229e5b2640fc5715e77607a989748be588d983f2 (diff) | |
| parent | 8d1934ec8d3ae75c19afe9b1de4373801d383a9f (diff) | |
| download | rust-9f3c96b869b48ecd0bb556c6ad9cd603b4dacfb9.tar.gz rust-9f3c96b869b48ecd0bb556c6ad9cd603b4dacfb9.zip | |
Auto merge of #73711 - Dylan-DPC:rollup-kzx15of, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #72700 (`improper_ctypes_definitions` lint) - #73516 (Allow dynamic linking for iOS/tvOS targets) - #73616 (Liballoc minor hash import tweak) - #73634 (Add UI test for issue 73592) - #73688 (Document the self keyword) - #73698 (Add procedure for prioritization notifications on Zulip) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/vec.rs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index d10cbf1afab..f1b560b9b96 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -92,11 +92,13 @@ //! pub struct Foo; //! //! #[no_mangle] +//! #[allow(improper_ctypes_definitions)] //! pub extern "C" fn foo_new() -> Box<Foo> { //! Box::new(Foo) //! } //! //! #[no_mangle] +//! #[allow(improper_ctypes_definitions)] //! pub extern "C" fn foo_delete(_: Option<Box<Foo>>) {} //! ``` //! diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index fc8a992e170..1265d0e56b5 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -62,7 +62,7 @@ use core::array::LengthAtMost32; use core::cmp::{self, Ordering}; use core::fmt; -use core::hash::{self, Hash}; +use core::hash::{Hash, Hasher}; use core::intrinsics::{arith_offset, assume}; use core::iter::{FromIterator, FusedIterator, TrustedLen}; use core::marker::PhantomData; @@ -1943,7 +1943,7 @@ impl<T: Clone> Clone for Vec<T> { #[stable(feature = "rust1", since = "1.0.0")] impl<T: Hash> Hash for Vec<T> { #[inline] - fn hash<H: hash::Hasher>(&self, state: &mut H) { + fn hash<H: Hasher>(&self, state: &mut H) { Hash::hash(&**self, state) } } |
