Remove redundant code in whitespace stripping #11039

mbrubeck · 2016-05-05T23:46:58Z

LineBreaker calls Fragment::strip_trailing_whitespace_if_necessary and then recalculates the fragment's inline size. But this isn't necessary because strip_trailing_whitespace_if_necessary already recalculates the size.

r? @pcwalton

This change is


        Remove redundant code in whitespace stripping

LineBreaker calls Fragment::strip_trailing_whitespace_if_necessary and then recalculates the fragment's inline size. But this isn't necessary because strip_trailing_whitespace_if_necessary already recalculates the size.

highfive · 2016-05-05T23:47:02Z

Warning

These commits modify layout code, but no tests are modified.Please consider adding a test!

pcwalton · 2016-05-06T00:27:46Z

@bors-servo: r+

bors-servo · 2016-05-06T00:27:46Z

📌 Commit 887f0e6 has been approved by pcwalton

bors-servo · 2016-05-06T03:35:16Z

⌛ Testing commit 887f0e6 with merge 0f3253a...


        Auto merge of #11039 - mbrubeck:strip-trailing, r=pcwalton

@pcwalton

Remove redundant code in whitespace stripping LineBreaker calls Fragment::strip_trailing_whitespace_if_necessary and then recalculates the fragment's inline size. But this isn't necessary because strip_trailing_whitespace_if_necessary already recalculates the size. r? @pcwalton  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11039)

bors-servo · 2016-05-06T03:35:18Z

💔 Test failed - mac-dev-unit

jdm · 2016-05-06T14:49:30Z

@bors-servo: retry

servo/saltfs#349

jdm · 2016-05-06T14:50:27Z

@bors-servo: r-
Travis and appveyor both show build errors.

mbrubeck · 2016-05-06T17:19:29Z

@bors-servo r=pcwalton

Build error fixed by app_units upgrade in #11034. (Forgot I had the fix in a Cargo override.)

bors-servo · 2016-05-06T17:19:30Z

📌 Commit 887f0e6 has been approved by pcwalton

bors-servo · 2016-05-06T17:19:32Z

⌛ Testing commit 887f0e6 with merge a84e639...


        Auto merge of #11039 - mbrubeck:strip-trailing, r=pcwalton

@pcwalton

Remove redundant code in whitespace stripping LineBreaker calls Fragment::strip_trailing_whitespace_if_necessary and then recalculates the fragment's inline size. But this isn't necessary because strip_trailing_whitespace_if_necessary already recalculates the size. r? @pcwalton  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11039)

bors-servo · 2016-05-06T17:22:10Z

💔 Test failed - windows

mbrubeck · 2016-05-06T17:57:00Z

@bors-servo retry

servo/saltfs#363

bors-servo · 2016-05-06T18:45:27Z

⌛ Testing commit 887f0e6 with merge e091841...


        Auto merge of #11039 - mbrubeck:strip-trailing, r=pcwalton

@pcwalton

Remove redundant code in whitespace stripping LineBreaker calls Fragment::strip_trailing_whitespace_if_necessary and then recalculates the fragment's inline size. But this isn't necessary because strip_trailing_whitespace_if_necessary already recalculates the size. r? @pcwalton  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11039)

bors-servo · 2016-05-06T18:47:17Z

💔 Test failed - windows

larsbergstrom · 2016-05-06T19:39:56Z

@bors-servo retry

servo/saltfs#365

bors-servo · 2016-05-07T01:29:43Z

⌛ Testing commit 887f0e6 with merge 8dbc0ea...


        Auto merge of #11039 - mbrubeck:strip-trailing, r=pcwalton

@pcwalton

Remove redundant code in whitespace stripping LineBreaker calls Fragment::strip_trailing_whitespace_if_necessary and then recalculates the fragment's inline size. But this isn't necessary because strip_trailing_whitespace_if_necessary already recalculates the size. r? @pcwalton  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11039)

bors-servo · 2016-05-07T02:00:33Z

💔 Test failed - mac-rel-css

highfive · 2016-05-07T02:00:35Z

  ▶ CRASH [expected PASS] /css21_dev/html4/padding-top-013.htm
  │ 
  │ Shutting down the Constellation after generating an output file or exit flag specified
  │ thread &#39;ScriptThread PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(0) }&#39; panicked at &#39;called `Option::unwrap()` on a `None` value&#39;, ../src/libcore/option.rs:325
  │ stack backtrace:
  │    1:        0x104b69d18 - std::sys::backtrace::tracing::imp::write::h9fb600083204ae7f
  │    2:        0x104b6fff5 - std::panicking::default_hook::_$u7b$$u7b$closure$u7d$$u7d$::hca543c34f11229ac
  │    3:        0x104b6fc0e - std::panicking::default_hook::hc2c969e7453d080c
  │    4:        0x1042c5242 - util::panicking::initiate_panic_hook::_$u7b$$u7b$closure$u7d$$u7d$::_$u7b$$u7b$closure$u7d$$u7d$::heda6930908f06acc
  │    5:        0x104b574e8 - std::sys_common::unwind::begin_unwind_inner::h30e12d15ce2b2e25
  │    6:        0x104b58e1e - std::sys_common::unwind::begin_unwind_fmt::hb2de8a9968d38523
  │    7:        0x104b68fe7 - rust_begin_unwind
  │    8:        0x104b97db0 - core::panicking::panic_fmt::h257ceb0aa351d801
  │    9:        0x104b980ac - core::panicking::panic::h4bb1497076d04ab9
  │   10:        0x103c95b70 - script::page::Page::window::h010a05681584eec2
  │   11:        0x103b38fcc - std::sys_common::unwind::try::try_fn::hd12b2d76c81a0e30
  │   12:        0x104b68f7b - __rust_try
  │   13:        0x104b68f03 - std::sys_common::unwind::inner_try::h47a4d9cd4a369dcd
  │   14:        0x103b392ca - _&lt;F as std..boxed..FnBox&lt;A&gt;&gt;::call_box::he24f36d07ed1c7fd
  │   15:        0x104b6f078 - std::sys::thread::Thread::new::thread_start::h6f266e069bf4ec2b
  │   16:     0x7fff8c3c2059 - _pthread_body
  │   17:     0x7fff8c3c1fd6 - _pthread_start
  └ thread panicked while panicking. aborting.

jdm · 2016-05-07T02:39:59Z

@bors-srrvo retry
#11059

jdm · 2016-05-07T02:40:20Z

@bors-servo retry

bors-servo · 2016-05-07T04:53:28Z

⌛ Testing commit 887f0e6 with merge f80641e...


        Auto merge of #11039 - mbrubeck:strip-trailing, r=pcwalton

@pcwalton

Remove redundant code in whitespace stripping LineBreaker calls Fragment::strip_trailing_whitespace_if_necessary and then recalculates the fragment's inline size. But this isn't necessary because strip_trailing_whitespace_if_necessary already recalculates the size. r? @pcwalton  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11039)

bors-servo · 2016-05-07T07:04:03Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

highfive assigned pcwalton May 5, 2016

highfive added the S-awaiting-review label May 5, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels May 6, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels May 6, 2016

jdm added S-needs-code-changes and removed S-tests-failed labels May 6, 2016

highfive added S-awaiting-merge and removed S-needs-code-changes labels May 6, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels May 6, 2016

highfive removed the S-tests-failed label May 6, 2016

highfive added the S-awaiting-merge label May 6, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels May 6, 2016

highfive added S-awaiting-merge and removed S-tests-failed labels May 7, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels May 7, 2016

highfive added S-awaiting-merge and removed S-tests-failed labels May 7, 2016

bors-servo merged commit 887f0e6 into servo:master May 7, 2016
1 of 3 checks passed

1 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

continuous-integration/travis-ci/pr The Travis CI build failed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label May 7, 2016

mbrubeck deleted the mbrubeck:strip-trailing branch May 11, 2016

servo / servo

Remove redundant code in whitespace stripping #11039

Remove redundant code in whitespace stripping #11039

mbrubeck commented May 5, 2016 •

edited by larsbergstrom

highfive commented May 5, 2016

pcwalton commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

jdm commented May 6, 2016

jdm commented May 6, 2016

mbrubeck commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

mbrubeck commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

larsbergstrom commented May 6, 2016

bors-servo commented May 7, 2016

bors-servo commented May 7, 2016

highfive commented May 7, 2016

jdm commented May 7, 2016

jdm commented May 7, 2016

bors-servo commented May 7, 2016

bors-servo commented May 7, 2016

servo / servo

Join GitHub today

Remove redundant code in whitespace stripping #11039

Remove redundant code in whitespace stripping #11039

Conversation

mbrubeck commented May 5, 2016 • edited by larsbergstrom

highfive commented May 5, 2016

pcwalton commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

jdm commented May 6, 2016

jdm commented May 6, 2016

mbrubeck commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

mbrubeck commented May 6, 2016

bors-servo commented May 6, 2016

bors-servo commented May 6, 2016

larsbergstrom commented May 6, 2016

bors-servo commented May 7, 2016

bors-servo commented May 7, 2016

highfive commented May 7, 2016

jdm commented May 7, 2016

jdm commented May 7, 2016

bors-servo commented May 7, 2016

bors-servo commented May 7, 2016

mbrubeck commented May 5, 2016 •

edited by larsbergstrom