Merge branch 'rust_1.74' of https://github.com/thepowersgang/mrustc i…

…nto rust_1.74

src/main.cpp

@@ -35,6 +35,8 @@
 # define NOGDI
 # include <Windows.h>
 # include <DbgHelp.h>
+# undef min
+# undef max
 #endif
 
 TargetVersion	gTargetVersion = TargetVersion::Rustc1_29;
@@ -382,7 +384,7 @@ int main(int argc, char *argv[])
                 s2 = 0;
             else
                 s2 += 1;
-            s = max(s, s2);
+            s = std::max(s, s2);
             auto e = params.infile.find_first_of('.', s);
             if( e == ::std::string::npos )
                 e = params.infile.size() - s;

vsproject/run_hello_Pick.cmd

@@ -1,6 +1,5 @@
-@echo off
-rem if "%1" == "1.19" call run_local_tests_119.cmd
-if "%1" == "1.29" call run_local_tests.cmd
-rem if "%1" == "1.39" call run_local_tests_139.cmd
-if "%1" == "1.54" call run_local_tests_154.cmd
-if "%1" == "1.74" call run_local_tests_174.cmd
+@if "%1" == "1.19" call run_hello_119.cmd
+@if "%1" == "1.29" call run_hello.cmd
+@if "%1" == "1.39" call run_hello_139.cmd
+@if "%1" == "1.54" call run_hello_154.cmd
+@if "%1" == "1.74" call run_hello_174.cmd

vsproject/run_local_tests_154.cmd

@@ -1,4 +1,4 @@
-@call build_std_174.cmd
+@call build_std_154.cmd
 @if %errorlevel% neq 0 exit /b %errorlevel%
 
 @mkdir %OUTDIR%\local_tests\

vsproject/run_local_tests_Pick.cmd

@@ -1,5 +1,6 @@
-@if "%1" == "1.19" call run_hello_119.cmd
-@if "%1" == "1.29" call run_hello.cmd
-@if "%1" == "1.39" call run_hello_139.cmd
-@if "%1" == "1.54" call run_hello_154.cmd
-@if "%1" == "1.74" call run_hello_174.cmd
+@echo off
+rem if "%1" == "1.19" call run_local_tests_119.cmd
+if "%1" == "1.29" call run_local_tests.cmd
+rem if "%1" == "1.39" call run_local_tests_139.cmd
+if "%1" == "1.54" call run_local_tests_154.cmd
+if "%1" == "1.74" call run_local_tests_174.cmd