diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-08-16 10:03:47 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-08-16 10:03:47 -0700 |
| commit | 1210ebff43d1f9a71668646c146917064731c499 (patch) | |
| tree | c87433f1d9016b69fa31d038d41b8e9303bd34a2 /src/liballoc/boxed.rs | |
| parent | 17197c660c9cc2e29d27d496a5c65f7df39fd858 (diff) | |
| parent | c88624682ddb5768cca4dacc8482e9bc966261fc (diff) | |
| download | rust-1210ebff43d1f9a71668646c146917064731c499.tar.gz rust-1210ebff43d1f9a71668646c146917064731c499.zip | |
Merge remote-tracking branch 'origin/master' into gen
Diffstat (limited to 'src/liballoc/boxed.rs')
| -rw-r--r-- | src/liballoc/boxed.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 17dc3d03aae..26692b6e3da 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -169,7 +169,7 @@ fn make_place<T>() -> IntermediateBox<T> { IntermediateBox { ptr: p, - layout: layout, + layout, marker: marker::PhantomData, } } |