merge

SmithyDafnyMakefile.mk

@@ -212,7 +212,7 @@ transpile_implementation:
 		$(TRANSPILE_MODULE_NAME) \
 		$(if $(strip $(STD_LIBRARY)) , --library:$(PROJECT_ROOT)/$(STD_LIBRARY)/src/Index.dfy, ) \
 		$(TRANSLATION_RECORD) \
-		$(TRANSPILE_DEPENDENCIES) \
+		$(TRANSPILE_DEPENDENCIES)
 
 
 # If the project under transpilation uses `replaceable` modules,

TestModels/SimpleTypes/SimpleTimestamp/test/SimpleTimestampImplTest.dfy

@@ -19,7 +19,7 @@ module SimpleTimestampImplTest {
       modifies client.Modifies
       ensures client.ValidState()
     {
-        var dafnyTimestamp := "2024-06-11T12:34:56";
+        var dafnyTimestamp := "2024-06-11T12:34:56Z";
         var ret :- expect client.GetTimestamp(SimpleTimestamp.Types.GetTimestampInput(value:= Some(dafnyTimestamp)));
         expect ret.value == Some(dafnyTimestamp);
         print ret;

TestModels/dafny-dependencies/Model/traits.smithy

@@ -24,7 +24,7 @@ list ServiceList {
 // A trait for explicitly modeling the configuration options that should be
 // available in the generated methods for creating clients.
 @trait(selector: "service")
-@protocolDefinition()
+@protocolDefinition
 structure localService {
   @required
   sdkId: String,

TestModels/dafny-dependencies/StandardLibrary/Makefile

@@ -46,7 +46,6 @@ polymorph_python :
 # Using this target for the side-effect of maintaining patches,
 # Since Dafny Rust code generation is incomplete and also needs to be patched.
 # That only works if you run transpile_rust first.
-
 polymorph_rust :
 	echo "Skipping polymorph_rust for StandardLibrary"
 
@@ -96,10 +95,19 @@ transpile_implementation:
 		--allow-warnings \
 		--output $(OUT) \
 		$(DAFNY_OPTIONS) \
+<<<<<<< HEAD
 		$(TRANSPILE_MODULE_NAME)
 
 		$(DAFNY_OTHER_FILES) \
 		-out $(OUT)
+=======
+<<<<<<< HEAD
+		$(TRANSPILE_MODULE_NAME)
+=======
+		$(DAFNY_OTHER_FILES) \
+		-out $(OUT)
+>>>>>>> main-1.x
+>>>>>>> python-reviewed
 
 # Override SharedMakefile's build_java to not install
 # StandardLibrary as a dependency