Skip to content

Commit

Permalink
Merge #17
Browse files Browse the repository at this point in the history
17: Remove layout polyfill 🎉 r=CAD97 a=CAD97

The polyfilled methods are [stable in 1.44](https://doc.rust-lang.org/beta/std/alloc/struct.Layout.html#method.extend).

This PR can be merged once 1.44 is stable [on 2020-06-04](https://www.whatrustisit.com/).

Co-authored-by: CAD97 <[email protected]>
  • Loading branch information
bors[bot] and CAD97 authored Jun 16, 2020
2 parents a39fe7d + d696641 commit b775c1f
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 77 deletions.
3 changes: 0 additions & 3 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
codecov:
token: 3887c465-e1e2-44ea-9842-6a54e3e5838c

ignore:
- "src/layout_polyfill.rs" # not used on 1.44 and later

coverage:
status:
project:
Expand Down
3 changes: 0 additions & 3 deletions src/green/node.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#![allow(unstable_name_collisions)] // LayoutPolyfill, be aware!

use {
crate::{
green::{
unpack_node_or_token, Children, Element, FullAlignedElement, HalfAlignedElement,
PackedNodeOrToken,
},
layout_polyfill::LayoutPolyfill,
Kind, TextSize,
},
erasable::{Erasable, ErasedPtr},
Expand Down
4 changes: 1 addition & 3 deletions src/green/token.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#![allow(unstable_name_collisions)] // LayoutPolyfill, be aware!

use {
crate::{layout_polyfill::LayoutPolyfill, Kind, TextSize},
crate::{Kind, TextSize},
erasable::{Erasable, ErasedPtr},
slice_dst::{AllocSliceDst, SliceDst},
std::{alloc::Layout, convert::TryFrom, hash, ptr},
Expand Down
67 changes: 0 additions & 67 deletions src/layout_polyfill.rs

This file was deleted.

1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const ASSERT_TEXTSIZE_IS_U32: fn() = || {

pub mod green;
mod utils;
mod layout_polyfill;

#[doc(inline)]
pub use crate::utils::{Kind, NodeOrToken};
Expand Down

0 comments on commit b775c1f

Please sign in to comment.