From bb2b8630f5ae9128f80d4e7a5d30f63aed55934f Mon Sep 17 00:00:00 2001
From: "Zack M. Davis" <code@zackmdavis.net>
Date: Wed, 19 Jul 2017 16:32:20 -0700
Subject: [PATCH] run-make test for JSON error byte start/end

This is in the matter of #35164.
---
 src/test/run-make/issue-35164/Makefile         |  4 ++++
 src/test/run-make/issue-35164/main.rs          | 15 +++++++++++++++
 src/test/run-make/issue-35164/submodule/mod.rs | 13 +++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 src/test/run-make/issue-35164/Makefile
 create mode 100644 src/test/run-make/issue-35164/main.rs
 create mode 100644 src/test/run-make/issue-35164/submodule/mod.rs

diff --git a/src/test/run-make/issue-35164/Makefile b/src/test/run-make/issue-35164/Makefile
new file mode 100644
index 00000000000..c7bc26e3f5a
--- /dev/null
+++ b/src/test/run-make/issue-35164/Makefile
@@ -0,0 +1,4 @@
+-include ../tools.mk
+
+all:
+	$(RUSTC) main.rs --error-format json 2>&1 | grep -q '"byte_start":490.*"byte_end":496'
diff --git a/src/test/run-make/issue-35164/main.rs b/src/test/run-make/issue-35164/main.rs
new file mode 100644
index 00000000000..24322a2484f
--- /dev/null
+++ b/src/test/run-make/issue-35164/main.rs
@@ -0,0 +1,15 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+mod submodule;
+
+fn main() {
+    submodule::foo();
+}
diff --git a/src/test/run-make/issue-35164/submodule/mod.rs b/src/test/run-make/issue-35164/submodule/mod.rs
new file mode 100644
index 00000000000..7847c13af78
--- /dev/null
+++ b/src/test/run-make/issue-35164/submodule/mod.rs
@@ -0,0 +1,13 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub fn foo() {
+    let _MyFoo = 2;
+}
-- 
GitLab