Merge remote-tracking branch 'origin/develop' into breaking

test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol

@@ -0,0 +1,5 @@
+contract C {
+    error E(int bytes, bytes x);
+}
+// ----
+// ParserError 2314: (29-34): Expected ',' but got 'bytes'

test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_param_name.sol

@@ -0,0 +1,12 @@
+contract C {
+    enum EnumType {A, B, C}
+
+    struct StructType {
+        uint x;
+    }
+
+    error E1(StructType StructType);
+    error E2(EnumType EnumType);
+    error E3(EnumType StructType, StructType EnumType);
+}
+// ----

test/libsolidity/syntaxTests/errors/internal_type.sol

@@ -0,0 +1,9 @@
+error E1(function() internal);
+error E2(S);
+
+struct S {
+    S[] ss;
+}
+// ----
+// TypeError 3417: (9-29): Internal or recursive type is not allowed as error parameter type.
+// TypeError 3417: (40-41): Internal or recursive type is not allowed as error parameter type.

test/libsolidity/syntaxTests/errors/no_mappings.sol

@@ -4,6 +4,3 @@ contract C {
 }
 // ----
 // TypeError 3448: (14-35): Type containing a (nested) mapping is not allowed as error parameter type.
-// TypeError 3417: (14-35): Internal or recursive type is not allowed as error parameter type.
-// TypeError 3448: (70-91): Type containing a (nested) mapping is not allowed as error parameter type.
-// TypeError 3417: (70-91): Internal or recursive type is not allowed as error parameter type.