diff --git a/src/components/main/layout/block.rs b/src/components/main/layout/block.rs index 88904d489c3..fc90d3273d2 100644 --- a/src/components/main/layout/block.rs +++ b/src/components/main/layout/block.rs @@ -146,7 +146,7 @@ impl BlockFlowData { //If all have a computed value other than 'auto', the system is over-constrained and we need to discard a margin. //if direction is ltr, ignore the specified right margin and solve for it. If it is rtl, ignore the specified //left margin. FIXME(eatkinson): this assumes the direction is ltr - (Specified(margin_l), Specified(width), Specified(margin_r)) => (margin_l, width, available_width - (margin_l + width )), + (Specified(margin_l), Specified(width), Specified(_margin_r)) => (margin_l, width, available_width - (margin_l + width )), //If exactly one value is 'auto', solve for it (Auto, Specified(width), Specified(margin_r)) => (available_width - (width + margin_r), width, margin_r), diff --git a/src/support/css/rust-css b/src/support/css/rust-css index 09d2db847c1..ca4e2c62e0f 160000 --- a/src/support/css/rust-css +++ b/src/support/css/rust-css @@ -1 +1 @@ -Subproject commit 09d2db847c11bcab7f1832d5daf5947a7c1384ee +Subproject commit ca4e2c62e0f7720d32636b9deaa8af705ce6cdce diff --git a/src/support/glut/rust-glut b/src/support/glut/rust-glut index dd25d69abde..637434c8d3e 160000 --- a/src/support/glut/rust-glut +++ b/src/support/glut/rust-glut @@ -1 +1 @@ -Subproject commit dd25d69abde67e2275fbbbd93196043b69afd67b +Subproject commit 637434c8d3ed968b01a40521a836af76b4e7b967