Fix build after rebase

Author: nicoburns

bindings/c/examples/compile_basic.sh

@@ -3,4 +3,4 @@
 set -ex
 
 cargo build --manifest-path ../Cargo.toml
-gcc -O3 -DDEBUG -o basic basic.c -std=c99 -Wall -I../include -L../../target/debug -lctaffy
+gcc -O3 -DDEBUG -o basic basic.c -std=c99 -Wall -I../include -L../../../target/debug -lctaffy

bindings/c/include/taffy.h

@@ -193,6 +193,9 @@ typedef enum TaffyMeasureMode {
 typedef enum TaffyOverflow {
   // The automatic minimum size of this node as a flexbox/grid item should be based on the size of it's content.
   TAFFY_OVERFLOW_VISIBLE,
+  // The automatic minimum size of this node as a flexbox/grid item should be based on the size of its content.
+  // Content that overflows this node should *not* contribute to the scroll region of its parent.
+  TAFFY_OVERFLOW_CLIP,
   // The automatic minimum size of this node as a flexbox/grid item should be `0`.
   TAFFY_OVERFLOW_HIDDEN,
   // The automatic minimum size of this node as a flexbox/grid item should be `0`. Additionally, space should be reserved
@@ -323,7 +326,11 @@ typedef struct TaffySize {
   float height;
 } TaffySize;
 
-typedef struct TaffySize (*TaffyMeasureFunction)(enum TaffyMeasureMode width_measure_mode, float width, enum TaffyMeasureMode height_measure_mode, float height, void *context);
+typedef struct TaffySize (*TaffyMeasureFunction)(enum TaffyMeasureMode width_measure_mode,
+                                                 float width,
+                                                 enum TaffyMeasureMode height_measure_mode,
+                                                 float height,
+                                                 void *context);
 
 typedef struct TaffyLayout {
   float x;

bindings/c/src/style_enums.rs

@@ -93,6 +93,9 @@ impl From<core::Position> for TaffyPosition {
 pub enum TaffyOverflow {
     /// The automatic minimum size of this node as a flexbox/grid item should be based on the size of it's content.
     Visible,
+    /// The automatic minimum size of this node as a flexbox/grid item should be based on the size of its content.
+    /// Content that overflows this node should *not* contribute to the scroll region of its parent.
+    Clip,
     /// The automatic minimum size of this node as a flexbox/grid item should be `0`.
     Hidden,
     /// The automatic minimum size of this node as a flexbox/grid item should be `0`. Additionally, space should be reserved
@@ -103,6 +106,7 @@ impl From<TaffyOverflow> for core::Overflow {
     fn from(input: TaffyOverflow) -> core::Overflow {
         match input {
             TaffyOverflow::Visible => core::Overflow::Visible,
+            TaffyOverflow::Clip => core::Overflow::Clip,
             TaffyOverflow::Hidden => core::Overflow::Hidden,
             TaffyOverflow::Scroll => core::Overflow::Scroll,
         }
@@ -112,6 +116,7 @@ impl From<core::Overflow> for TaffyOverflow {
     fn from(input: core::Overflow) -> TaffyOverflow {
         match input {
             core::Overflow::Visible => TaffyOverflow::Visible,
+            core::Overflow::Clip => TaffyOverflow::Clip,
             core::Overflow::Hidden => TaffyOverflow::Hidden,
             core::Overflow::Scroll => TaffyOverflow::Scroll,
         }

bindings/c/src/tree.rs

@@ -5,7 +5,7 @@ use super::{
 use ::core::ffi::c_void;
 use taffy::prelude as core;
 use taffy::style::AvailableSpace;
-use taffy::Taffy as CoreTaffy;
+use taffy::TaffyTree as CoreTaffy;
 
 pub type TaffyMeasureFunction = extern "C" fn(
     width_measure_mode: TaffyMeasureMode,