diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-04-03 16:01:29 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-04-12 22:53:13 +0200 |
| commit | 93a9ad4897e560ccd5ebc3397afb7d83d990ef42 (patch) | |
| tree | 9712baa4ee6bf075c039b61a216351ea7777977e /src/libcore/alloc.rs | |
| parent | 157ff8cd0562eefdd7aa296395c38a7bc259a4b9 (diff) | |
| download | rust-93a9ad4897e560ccd5ebc3397afb7d83d990ef42.tar.gz rust-93a9ad4897e560ccd5ebc3397afb7d83d990ef42.zip | |
Remove the now-unit-struct AllocErr field inside CollectionAllocErr
Diffstat (limited to 'src/libcore/alloc.rs')
| -rw-r--r-- | src/libcore/alloc.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs index 1ba4c641065..23532c61721 100644 --- a/src/libcore/alloc.rs +++ b/src/libcore/alloc.rs @@ -356,13 +356,13 @@ pub enum CollectionAllocErr { /// (usually `isize::MAX` bytes). CapacityOverflow, /// Error due to the allocator (see the `AllocErr` type's docs). - AllocErr(AllocErr), + AllocErr, } #[unstable(feature = "try_reserve", reason = "new API", issue="48043")] impl From<AllocErr> for CollectionAllocErr { - fn from(err: AllocErr) -> Self { - CollectionAllocErr::AllocErr(err) + fn from(AllocErr: AllocErr) -> Self { + CollectionAllocErr::AllocErr } } |