Merge remote-tracking branch 'origin/main' into cache

# Conflicts: # crates/gpui/src/elements/div.rs
2024-01-15 11:37:46 +01:00
parent f4a7f6f4c3 600b5c65e9
commit 4ff514ca7e
48 changed files with 600 additions and 903 deletions
@@ -3319,13 +3319,6 @@ impl AnyWindowHandle {
    }
 }

-// #[cfg(any(test, feature = "test-support"))]
-// impl From<SmallVec<[u32; 16]>> for StackingOrder {
-//     fn from(small_vec: SmallVec<[u32; 16]>) -> Self {
-//         StackingOrder(small_vec)
-//     }
-// }
-
 /// An identifier for an [`Element`](crate::Element).
 ///
 /// Can be constructed with a string, a number, or both, as well