diff options
| author | Jack Moffitt <jack@metajack.im> | 2014-11-05 12:33:11 -0700 |
|---|---|---|
| committer | Glenn Watson <gw@intuitionlibrary.com> | 2014-11-13 11:17:43 +1000 |
| commit | d1b433a3b3bab353f320b2f39fa953ce326d2d55 (patch) | |
| tree | d7a197abb65827b36c47e6b5c3adcce9071643d3 /components/layout/model.rs | |
| parent | 26045d7fcbab8851fbefe2851cd904203f8fd8dd (diff) | |
| download | servo-d1b433a3b3bab353f320b2f39fa953ce326d2d55.tar.gz servo-d1b433a3b3bab353f320b2f39fa953ce326d2d55.zip | |
Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a
Diffstat (limited to 'components/layout/model.rs')
| -rw-r--r-- | components/layout/model.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/model.rs b/components/layout/model.rs index 05a5d589855..49506b43475 100644 --- a/components/layout/model.rs +++ b/components/layout/model.rs @@ -4,7 +4,7 @@ //! Borders, padding, and margins. -#![deny(unsafe_block)] +#![deny(unsafe_blocks)] use fragment::Fragment; @@ -217,7 +217,7 @@ impl MarginCollapseInfo { (AccumulatingCollapsibleTopMargin, MarginsCollapse(..)) => { // Can't happen because the state will have been replaced with // `AccumulatingMarginIn` above. - fail!("should not be accumulating collapsible block_start margins anymore!") + panic!("should not be accumulating collapsible block_start margins anymore!") } (AccumulatingCollapsibleTopMargin, MarginsCollapseThrough(margin)) => { self.block_start_margin.union(margin); |