From 6061a14e9f77608ad25ffa8e865471c65bf8404d Mon Sep 17 00:00:00 2001 From: vegorov-rbx <75688451+vegorov-rbx@users.noreply.github.com> Date: Mon, 20 Jan 2025 08:05:58 -0800 Subject: [PATCH] Fixup desync between internal and external codebases (#1622) During conflict resolution while transferring patches back and forth, some conflict resolutions may cause differences that are harder to spot. This process would have also cleaned up differences noted in https://github.com/luau-lang/luau/pull/1621 --- Analysis/src/Differ.cpp | 3 --- Analysis/src/EmbeddedBuiltinDefinitions.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Analysis/src/Differ.cpp b/Analysis/src/Differ.cpp index 7debae9c..e6222067 100644 --- a/Analysis/src/Differ.cpp +++ b/Analysis/src/Differ.cpp @@ -13,7 +13,6 @@ namespace Luau { - std::string DiffPathNode::toString() const { switch (kind) @@ -945,14 +944,12 @@ std::vector>::const_reverse_iterator DifferEnvironment return visitingStack.crend(); } - DifferResult diff(TypeId ty1, TypeId ty2) { DifferEnvironment differEnv{ty1, ty2, std::nullopt, std::nullopt}; return diffUsingEnv(differEnv, ty1, ty2); } - DifferResult diffWithSymbols(TypeId ty1, TypeId ty2, std::optional symbol1, std::optional symbol2) { DifferEnvironment differEnv{ty1, ty2, symbol1, symbol2}; diff --git a/Analysis/src/EmbeddedBuiltinDefinitions.cpp b/Analysis/src/EmbeddedBuiltinDefinitions.cpp index 937c414c..dc16cb07 100644 --- a/Analysis/src/EmbeddedBuiltinDefinitions.cpp +++ b/Analysis/src/EmbeddedBuiltinDefinitions.cpp @@ -2,9 +2,9 @@ #include "Luau/BuiltinDefinitions.h" LUAU_FASTFLAGVARIABLE(LuauVectorDefinitionsExtra) -LUAU_FASTFLAG(LuauVector2Constructor) LUAU_FASTFLAG(LuauBufferBitMethods2) LUAU_FASTFLAGVARIABLE(LuauMathMapDefinition) +LUAU_FASTFLAG(LuauVector2Constructor) namespace Luau {