Skip to content

Commit 8ff6c3b

Browse files
antonsyndantonsynd
committed
Merge branch 'claude/fix-collection-literal-contextual-type' into dev
# Conflicts: # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/collection_literal_mixed_types.expected # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/collection_literal_mixed_types.spy # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/dict_literal_assignment.expected # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/dict_literal_assignment.spy # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/dict_literal_return_type.expected # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/dict_literal_return_type.spy # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/list_literal_return_type.expected # src/Sharpy.Compiler.Tests/Integration/TestFixtures/collections/list_literal_return_type.spy # src/Sharpy.Compiler.Tests/Integration/TestFixtures/optional_result/optional_some_constructor_arg.expected # src/Sharpy.Compiler.Tests/Integration/TestFixtures/optional_result/optional_some_constructor_arg.spy # src/Sharpy.Compiler.Tests/Integration/TestFixtures/optional_result/optional_some_function_arg.expected # src/Sharpy.Compiler.Tests/Integration/TestFixtures/optional_result/optional_some_function_arg.spy # src/Sharpy.Compiler.Tests/Integration/TestFixtures/optional_result/optional_some_nested_constructor.expected # src/Sharpy.Compiler.Tests/Integration/TestFixtures/optional_result/optional_some_nested_constructor.spy # src/Sharpy.Compiler/Semantic/TypeChecker.Expressions.Access.cs # src/Sharpy.Compiler/Semantic/TypeChecker.Expressions.Literals.cs # src/Sharpy.Compiler/Semantic/TypeChecker.Utilities.cs
2 parents 9ac33b1 + e1a1359 commit 8ff6c3b

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)