luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-01-22 18:58:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup desync between internal and external codebases (#1622)
Some checks failed
benchmark / callgrind (map[branch:main name:luau-lang/benchmark-data], ubuntu-22.04) (push) Has been cancelled
Details
build / macos (push) Has been cancelled
Details
build / macos-arm (push) Has been cancelled
Details
build / ubuntu (push) Has been cancelled
Details
build / windows (Win32) (push) Has been cancelled
Details
build / windows (x64) (push) Has been cancelled
Details
build / coverage (push) Has been cancelled
Details
build / web (push) Has been cancelled
Details
release / macos (push) Has been cancelled
Details
release / ubuntu (push) Has been cancelled
Details
release / windows (push) Has been cancelled
Details
release / web (push) Has been cancelled
Details

Browse source 
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
This commit is contained in:
vegorov-rbx 2025-01-20 08:05:58 -08:00 committed by GitHub
parent 82c9383a39
commit 6061a14e9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 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};

2
Analysis/src/EmbeddedBuiltinDefinitions.cpp
View file

@ -2,9 +2,9 @@
#include "Luau/BuiltinDefinitions.h" #include "Luau/BuiltinDefinitions.h"
LUAU_FASTFLAGVARIABLE(LuauVectorDefinitionsExtra) LUAU_FASTFLAGVARIABLE(LuauVectorDefinitionsExtra)
LUAU_FASTFLAG(LuauVector2Constructor)
LUAU_FASTFLAG(LuauBufferBitMethods2) LUAU_FASTFLAG(LuauBufferBitMethods2)
LUAU_FASTFLAGVARIABLE(LuauMathMapDefinition) LUAU_FASTFLAGVARIABLE(LuauMathMapDefinition)
LUAU_FASTFLAG(LuauVector2Constructor)
namespace Luau namespace Luau
{ {