diff options
| author | bors <bors@rust-lang.org> | 2019-03-28 02:00:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-28 02:00:57 +0000 |
| commit | d20e0002725d2b3efff23c97450806b3517ba804 (patch) | |
| tree | 30dcba1cf4ff7e25de3fd495278e0458ba6c5c98 /src/libstd/alloc.rs | |
| parent | 33ef0bad21d6bb646c7c3ab0dbf381ca96c324bf (diff) | |
| parent | a2c4562690db552c845804223e302d42efd48c98 (diff) | |
| download | rust-d20e0002725d2b3efff23c97450806b3517ba804.tar.gz rust-d20e0002725d2b3efff23c97450806b3517ba804.zip | |
Auto merge of #59471 - cuviper:rollup, r=cuviper
Rollup of 18 pull requests
Successful merges:
- #57293 (Make some lints incremental)
- #57565 (syntax: Remove warning for unnecessary path disambiguators)
- #58253 (librustc_driver => 2018)
- #58837 (librustc_interface => 2018)
- #59268 (Add suggestion to use `&*var` when `&str: From<String>` is expected)
- #59283 (Make ASCII case conversions more than 4× faster)
- #59284 (adjust MaybeUninit API to discussions)
- #59372 (add rustfix-able suggestions to trim_{left,right} deprecations)
- #59390 (Make `ptr::eq` documentation mention fat-pointer behavior)
- #59393 (Refactor tuple comparison tests)
- #59420 ([CI] record docker image info for reuse)
- #59421 (Reject integer suffix when tuple indexing)
- #59430 (Renames `EvalContext` to `InterpretCx`)
- #59439 (Generalize diagnostic for `x = y` where `bool` is the expected type)
- #59449 (fix: Make incremental artifact deletion more robust)
- #59451 (Add `Default` to `std::alloc::System`)
- #59459 (Add some tests)
- #59460 (Include id in Thread's Debug implementation)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libstd/alloc.rs')
| -rw-r--r-- | src/libstd/alloc.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index a13da2901df..4241f47b661 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -130,7 +130,7 @@ pub use alloc_crate::alloc::*; /// program opts in to using jemalloc as the global allocator, `System` will /// still allocate memory using `malloc` and `HeapAlloc`. #[stable(feature = "alloc_system_type", since = "1.28.0")] -#[derive(Debug, Copy, Clone)] +#[derive(Debug, Default, Copy, Clone)] pub struct System; // The Alloc impl just forwards to the GlobalAlloc impl, which is in `std::sys::*::alloc`. |
