From 27575d19c805e166d8393e3c586613256eb0c6e3 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Sun, 9 Feb 2020 22:44:23 -0500
Subject: [PATCH] avoid conflict with master branch

---
 test/compile_errors.zig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index 53858dd6ae..4112ece4c4 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -3,6 +3,12 @@ const builtin = @import("builtin");
 const Target = @import("std").Target;
 
 pub fn addCases(cases: *tests.CompileErrorContext) void {
+    cases.addTest("dependency loop in top-level decl with @TypeInfo",
+        \\export const foo = @typeInfo(@This());
+    , &[_][]const u8{
+        "tmp.zig:1:20: error: dependency loop detected",
+    });
+
     cases.add("function call assigned to incorrect type",
         \\export fn entry() void {
         \\    var arr: [4]f32 = undefined;
@@ -27,12 +33,6 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
         "tmp.zig:3:18: error: expected type '[]i32', found 'anyerror!i32",
     });
 
-    cases.addTest("dependency loop in top-level decl with @TypeInfo",
-        \\export const foo = @typeInfo(@This());
-    , &[_][]const u8{
-        "tmp.zig:1:20: error: dependency loop detected",
-    });
-
     cases.addTest("non-exhaustive enums",
         \\const A = enum {
         \\    a,