luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-03-04 03:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into merge

Browse source
This commit is contained in:
Alexander Youngblood 2025-01-24 11:07:39 -08:00
commit 6167275b7a
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Analysis/src/Differ.cpp
View file

@ -13,7 +13,6 @@
namespace Luau namespace Luau
{ {
std::string DiffPathNode::toString() const std::string DiffPathNode::toString() const
{ {
switch (kind) switch (kind)
@ -945,14 +944,12 @@ std::vector<std::pair<TypeId, TypeId>>::const_reverse_iterator DifferEnvironment
return visitingStack.crend(); return visitingStack.crend();
} }
DifferResult diff(TypeId ty1, TypeId ty2) DifferResult diff(TypeId ty1, TypeId ty2)
{ {
DifferEnvironment differEnv{ty1, ty2, std::nullopt, std::nullopt}; DifferEnvironment differEnv{ty1, ty2, std::nullopt, std::nullopt};
return diffUsingEnv(differEnv, ty1, ty2); return diffUsingEnv(differEnv, ty1, ty2);
} }
DifferResult diffWithSymbols(TypeId ty1, TypeId ty2, std::optional<std::string> symbol1, std::optional<std::string> symbol2) DifferResult diffWithSymbols(TypeId ty1, TypeId ty2, std::optional<std::string> symbol1, std::optional<std::string> symbol2)
{ {
DifferEnvironment differEnv{ty1, ty2, symbol1, symbol2}; DifferEnvironment differEnv{ty1, ty2, symbol1, symbol2};

7
VM/src/lmathlib.cpp
View file

@ -7,7 +7,6 @@
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
LUAU_FASTFLAGVARIABLE(LuauMathMap)
LUAU_FASTFLAGVARIABLE(LuauMathLerp) LUAU_FASTFLAGVARIABLE(LuauMathLerp)
#undef PI #undef PI
@ -490,11 +489,5 @@ int luaopen_math(lua_State* L)
lua_setfield(L, -2, "lerp"); lua_setfield(L, -2, "lerp");
} }
if (FFlag::LuauMathLerp)
{
lua_pushcfunction(L, math_lerp, "lerp");
lua_setfield(L, -2, "lerp");
}
return 1; return 1;
} }