tests: remove ignore-stage1 where possible in proc_macro tests.

src/test/compile-fail-fulldeps/proc-macro/attr-invalid-exprs.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attr-stmt-expr.rs
-// ignore-stage1
 
 //! Attributes producing expressions in invalid locations
 

src/test/compile-fail-fulldeps/proc-macro/attr-stmt-expr.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attr-stmt-expr.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attribute-with-error.rs
-// ignore-stage1
 
 #![feature(custom_inner_attributes)]
 

src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attributes-included.rs
-// ignore-stage1
 // compile-pass
 
 #![warn(unused)]

src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:derive-bad.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate derive_bad;

src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:derive-unstable-2.rs
-// ignore-stage1
 
 #![allow(warnings)]
 

src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:derive-unstable.rs
-// ignore-stage1
 
 #![allow(warnings)]
 

src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:issue_38586.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate issue_38586;

src/test/compile-fail-fulldeps/proc-macro/issue-50493.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:issue_50493.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate issue_50493;

src/test/compile-fail-fulldeps/proc-macro/item-error.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:derive-b.rs
-// ignore-stage1
 
 #![allow(warnings)]
 

src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:bang_proc_macro2.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 #![allow(unused_macros)]

src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:test-macros.rs
-// ignore-stage1
 // ignore-wasm32
 
 extern crate test_macros;

src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:derive-b.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate derive_b;

src/test/incremental-fulldeps/incremental_proc_macro.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:incremental_proc_macro_aux.rs
-// ignore-stage1
 // revisions: cfail1 cfail2
 // compile-pass
 

src/test/incremental-fulldeps/issue-49482.rs

@@ -10,7 +10,6 @@
 
 // aux-build:issue_49482_macro_def.rs
 // aux-build:issue_49482_reexport.rs
-// ignore-stage1
 // revisions: rpass1
 
 extern crate issue_49482_reexport;

src/test/incremental-fulldeps/issue-54059.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:issue_54059.rs
-// ignore-stage1
 // ignore-wasm32-bare no libc for ffi testing
 // ignore-windows - dealing with weird symbols issues on dylibs isn't worth it
 // revisions: rpass1

src/test/pretty/attr-derive.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:derive-foo.rs
-// ignore-stage1
 // pp-exact
 // Testing that both the inner item and next outer item are
 // preserved, and that the first outer item parsed in main is not

src/test/run-make-fulldeps/issue-38237/Makefile

@@ -1,11 +1,5 @@
 -include ../tools.mk
 
-ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
-# ignore stage1
-all:
-
-else
 all:
 	$(RUSTC) foo.rs; $(RUSTC) bar.rs
 	$(RUSTDOC) baz.rs -L $(TMPDIR) -o $(TMPDIR)
-endif

src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile

@@ -1,12 +1,6 @@
 -include ../tools.mk
 
-ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
-# ignore stage1
-all:
-
-else
 all:
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs --emit dep-info
 	$(CGREP) -v "proc-macro source" < $(TMPDIR)/bar.d
-endif

src/test/run-pass-fulldeps/compiler-calls.rs

@@ -11,6 +11,7 @@
 // Test that the CompilerCalls interface to the compiler works.
 
 // ignore-cross-compile
+// ignore-stage1
 
 #![feature(rustc_private)]
 

src/test/run-pass-fulldeps/macro-quote-cond.rs

@@ -10,7 +10,6 @@
 
 #![allow(unused_parens)]
 // aux-build:cond_plugin.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/macro-quote-test.rs

@@ -11,7 +11,6 @@
 // Test that a macro can emit delimiters with nothing inside - `()`, `{}`
 
 // aux-build:hello_macro.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/proc-macro/add-impl.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:add-impl.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate add_impl;

src/test/run-pass-fulldeps/proc-macro/append-impl.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:append-impl.rs
-// ignore-stage1
 
 #![allow(warnings)]
 

src/test/run-pass-fulldeps/proc-macro/attr-args.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attr-args.rs
-// ignore-stage1
 
 #![allow(warnings)]
 

src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attr-cfg.rs
-// ignore-stage1
 // revisions: foo bar
 
 extern crate attr_cfg;

src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attr-on-trait.rs
-// ignore-stage1
 
 extern crate attr_on_trait;
 

src/test/run-pass-fulldeps/proc-macro/attr-stmt-expr.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attr-stmt-expr.rs
-// ignore-stage1
 
 #![feature(stmt_expr_attributes, proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/proc-macro/bang-macro.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:bang-macro.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/proc-macro/call-site.rs

@@ -11,7 +11,6 @@
 #![allow(unused_variables)]
 #![allow(unused_imports)]
 // aux-build:call-site.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:count_compound_ops.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/proc-macro/crate-var.rs

@@ -10,7 +10,6 @@
 
 // aux-build:double.rs
 // aux-build:external-crate-var.rs
-// ignore-stage1
 
 #![allow(unused)]
 

src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs

@@ -10,7 +10,6 @@
 
 #![allow(dead_code)]
 // aux-build:derive-attr-cfg.rs
-// ignore-stage1
 
 extern crate derive_attr_cfg;
 use derive_attr_cfg::Foo;

src/test/run-pass-fulldeps/proc-macro/derive-b.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:derive-b.rs
-// ignore-stage1
 
 #![feature(unrestricted_attribute_tokens)]
 

src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs

@@ -11,7 +11,6 @@
 #![allow(path_statements)]
 #![allow(dead_code)]
 // aux-build:derive-same-struct.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate derive_same_struct;

src/test/run-pass-fulldeps/proc-macro/derive-union.rs

@@ -10,7 +10,6 @@
 
 #![allow(unused_variables)]
 // aux-build:derive-union.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate derive_union;

src/test/run-pass-fulldeps/proc-macro/empty-crate.rs

@@ -10,7 +10,6 @@
 
 #![allow(unused_imports)]
 // aux-build:empty-crate.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate empty_crate;

src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:expand-with-a-macro.rs
-// ignore-stage1
 
 #![deny(warnings)]
 

src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs

@@ -11,7 +11,6 @@
 #![allow(unused_macros)]
 // aux-build:hygiene_example_codegen.rs
 // aux-build:hygiene_example.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/proc-macro/issue-39889.rs

@@ -10,7 +10,6 @@
 
 #![allow(dead_code)]
 // aux-build:issue-39889.rs
-// ignore-stage1
 
 extern crate issue_39889;
 use issue_39889::Issue39889;

src/test/run-pass-fulldeps/proc-macro/issue-42708.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:issue-42708.rs
-// ignore-stage1
 
 #![feature(decl_macro)]
 #![allow(unused)]

src/test/run-pass-fulldeps/proc-macro/issue-50061.rs

@@ -10,7 +10,6 @@
 
 #![allow(path_statements)]
 // aux-build:issue-50061.rs
-// ignore-stage1
 
 #![feature(decl_macro)]
 

src/test/run-pass-fulldeps/proc-macro/lifetimes.rs

@@ -10,7 +10,6 @@
 
 #![allow(unused_variables)]
 // aux-build:lifetimes.rs
-// ignore-stage1
 
 extern crate lifetimes;
 use lifetimes::*;

src/test/run-pass-fulldeps/proc-macro/load-two.rs

@@ -12,7 +12,6 @@
 #![allow(dead_code)]
 // aux-build:derive-atob.rs
 // aux-build:derive-ctod.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate derive_atob;

src/test/run-pass-fulldeps/proc-macro/macros-in-extern.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:test-macros.rs
-// ignore-stage1
 // ignore-wasm32
 
 #![feature(macros_in_extern)]

src/test/run-pass-fulldeps/proc-macro/negative-token.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:negative-token.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/run-pass-fulldeps/proc-macro/smoke.rs

@@ -11,7 +11,6 @@
 #![allow(unused_must_use)]
 #![allow(path_statements)]
 // aux-build:derive-a.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate derive_a;

src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs

@@ -10,7 +10,6 @@
 
 #![allow(dead_code)]
 // aux-build:derive-nothing.rs
-// ignore-stage1
 
 #[macro_use]
 extern crate derive_nothing;

src/test/run-pass-fulldeps/proc_macro.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:proc_macro_def.rs
-// ignore-stage1
 // ignore-cross-compile
 
 #![feature(proc_macro_hygiene)]

src/test/rustdoc/doc-proc-macro.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-stage1
-
 // Issue #52129: ICE when trying to document the `quote` proc-macro from proc_macro
 
 // As of this writing, we don't currently attempt to document proc-macros. However, we shouldn't

src/test/rustdoc/inline_cross/proc_macro.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-stage1
 // aux-build:proc_macro.rs
 // build-aux-docs
 

src/test/rustdoc/proc-macro.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-stage1
-
 #![crate_type="proc-macro"]
 #![crate_name="some_macros"]
 

src/test/rustdoc/rustc-macro-crate.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // no-prefer-dynamic
-// ignore-stage1
 
 #![crate_type = "proc-macro"]
 

src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import-ambig.rs

@@ -1,5 +1,4 @@
 // aux-build:plugin.rs
-// ignore-stage1
 
 #[macro_use(WithHelper)]
 extern crate plugin;

src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import-ambig.stderr

@@ -1,16 +1,16 @@
 error[E0659]: `helper` is ambiguous (derive helper attribute vs any other name)
-  --> $DIR/helper-attr-blocked-by-import-ambig.rs:10:3
+  --> $DIR/helper-attr-blocked-by-import-ambig.rs:9:3
    |
 LL | #[helper] //~ ERROR `helper` is ambiguous
    |   ^^^^^^ ambiguous name
    |
 note: `helper` could refer to the derive helper attribute defined here
-  --> $DIR/helper-attr-blocked-by-import-ambig.rs:9:10
+  --> $DIR/helper-attr-blocked-by-import-ambig.rs:8:10
    |
 LL | #[derive(WithHelper)]
    |          ^^^^^^^^^^
 note: `helper` could also refer to the attribute macro imported here
-  --> $DIR/helper-attr-blocked-by-import-ambig.rs:7:5
+  --> $DIR/helper-attr-blocked-by-import-ambig.rs:6:5
    |
 LL | use plugin::helper;
    |     ^^^^^^^^^^^^^^

src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import.rs

@@ -1,6 +1,5 @@
 // compile-pass
 // aux-build:plugin.rs
-// ignore-stage1
 
 #[macro_use(WithHelper)]
 extern crate plugin;

src/test/ui-fulldeps/custom-derive/issue-36935.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:plugin.rs
-// ignore-stage1
+
 
 #[macro_use] extern crate plugin;
 

src/test/ui-fulldeps/proc-macro/multispan.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:multispan.rs
-// ignore-stage1
 
 #![feature(proc_macro_hygiene)]
 

src/test/ui-fulldeps/proc-macro/multispan.stderr

@@ -1,83 +1,83 @@
 error: hello to you, too!
-  --> $DIR/multispan.rs:25:5
+  --> $DIR/multispan.rs:24:5
    |
 LL |     hello!(hi); //~ ERROR hello to you, too!
    |     ^^^^^^^^^^^
    |
 note: found these 'hi's
-  --> $DIR/multispan.rs:25:12
+  --> $DIR/multispan.rs:24:12
    |
 LL |     hello!(hi); //~ ERROR hello to you, too!
    |            ^^
 
 error: hello to you, too!
-  --> $DIR/multispan.rs:28:5
+  --> $DIR/multispan.rs:27:5
    |
 LL |     hello!(hi hi); //~ ERROR hello to you, too!
    |     ^^^^^^^^^^^^^^
    |
 note: found these 'hi's
-  --> $DIR/multispan.rs:28:12
+  --> $DIR/multispan.rs:27:12
    |
 LL |     hello!(hi hi); //~ ERROR hello to you, too!
    |            ^^ ^^
 
 error: hello to you, too!
-  --> $DIR/multispan.rs:31:5
+  --> $DIR/multispan.rs:30:5
    |
 LL |     hello!(hi hi hi); //~ ERROR hello to you, too!
    |     ^^^^^^^^^^^^^^^^^
    |
 note: found these 'hi's
-  --> $DIR/multispan.rs:31:12
+  --> $DIR/multispan.rs:30:12
    |
 LL |     hello!(hi hi hi); //~ ERROR hello to you, too!
    |            ^^ ^^ ^^
 
 error: hello to you, too!
-  --> $DIR/multispan.rs:34:5
+  --> $DIR/multispan.rs:33:5
    |
 LL |     hello!(hi hey hi yo hi beep beep hi hi); //~ ERROR hello to you, too!
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: found these 'hi's
-  --> $DIR/multispan.rs:34:12
+  --> $DIR/multispan.rs:33:12
    |
 LL |     hello!(hi hey hi yo hi beep beep hi hi); //~ ERROR hello to you, too!
    |            ^^     ^^    ^^           ^^ ^^
 
 error: hello to you, too!
-  --> $DIR/multispan.rs:35:5
+  --> $DIR/multispan.rs:34:5
    |
 LL |     hello!(hi there, hi how are you? hi... hi.); //~ ERROR hello to you, too!
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: found these 'hi's
-  --> $DIR/multispan.rs:35:12
+  --> $DIR/multispan.rs:34:12
    |
 LL |     hello!(hi there, hi how are you? hi... hi.); //~ ERROR hello to you, too!
    |            ^^        ^^              ^^    ^^
 
 error: hello to you, too!
-  --> $DIR/multispan.rs:36:5
+  --> $DIR/multispan.rs:35:5
    |
 LL |     hello!(whoah. hi di hi di ho); //~ ERROR hello to you, too!
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: found these 'hi's
-  --> $DIR/multispan.rs:36:19
+  --> $DIR/multispan.rs:35:19
    |
 LL |     hello!(whoah. hi di hi di ho); //~ ERROR hello to you, too!
    |                   ^^    ^^
 
 error: hello to you, too!
-  --> $DIR/multispan.rs:37:5
+  --> $DIR/multispan.rs:36:5
    |
 LL |     hello!(hi good hi and good bye); //~ ERROR hello to you, too!
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: found these 'hi's
-  --> $DIR/multispan.rs:37:12
+  --> $DIR/multispan.rs:36:12
    |
 LL |     hello!(hi good hi and good bye); //~ ERROR hello to you, too!
    |            ^^      ^^

src/test/ui-fulldeps/proc-macro/parent-source-spans.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:parent-source-spans.rs
-// ignore-stage1
+
 
 #![feature(decl_macro, proc_macro_hygiene)]
 

src/test/ui-fulldeps/proc-macro/three-equals.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:three-equals.rs
-// ignore-stage1
+
 
 #![feature(proc_macro_hygiene)]
 

src/test/ui-fulldeps/subspan.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:subspan.rs
-// ignore-stage1
 
 extern crate subspan;
 

src/test/ui-fulldeps/subspan.stderr

@@ -1,95 +1,95 @@
 error: found 'hi's
-  --> $DIR/subspan.rs:22:1
+  --> $DIR/subspan.rs:21:1
    |
 LL | subspan!("hi"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:22:11
+  --> $DIR/subspan.rs:21:11
    |
 LL | subspan!("hi"); //~ ERROR found 'hi's
    |           ^^
 
 error: found 'hi's
-  --> $DIR/subspan.rs:25:1
+  --> $DIR/subspan.rs:24:1
    |
 LL | subspan!("hihi"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:25:11
+  --> $DIR/subspan.rs:24:11
    |
 LL | subspan!("hihi"); //~ ERROR found 'hi's
    |           ^^^^
 
 error: found 'hi's
-  --> $DIR/subspan.rs:28:1
+  --> $DIR/subspan.rs:27:1
    |
 LL | subspan!("hihihi"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:28:11
+  --> $DIR/subspan.rs:27:11
    |
 LL | subspan!("hihihi"); //~ ERROR found 'hi's
    |           ^^^^^^
 
 error: found 'hi's
-  --> $DIR/subspan.rs:31:1
+  --> $DIR/subspan.rs:30:1
    |
 LL | subspan!("why I hide? hi!"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:31:17
+  --> $DIR/subspan.rs:30:17
    |
 LL | subspan!("why I hide? hi!"); //~ ERROR found 'hi's
    |                 ^^    ^^
 
 error: found 'hi's
-  --> $DIR/subspan.rs:32:1
+  --> $DIR/subspan.rs:31:1
    |
 LL | subspan!("hey, hi, hidy, hidy, hi hi"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:32:16
+  --> $DIR/subspan.rs:31:16
    |
 LL | subspan!("hey, hi, hidy, hidy, hi hi"); //~ ERROR found 'hi's
    |                ^^  ^^    ^^    ^^ ^^
 
 error: found 'hi's
-  --> $DIR/subspan.rs:33:1
+  --> $DIR/subspan.rs:32:1
    |
 LL | subspan!("this is a hi, and this is another hi"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:33:12
+  --> $DIR/subspan.rs:32:12
    |
 LL | subspan!("this is a hi, and this is another hi"); //~ ERROR found 'hi's
    |            ^^       ^^       ^^             ^^
 
 error: found 'hi's
-  --> $DIR/subspan.rs:34:1
+  --> $DIR/subspan.rs:33:1
    |
 LL | subspan!("how are you this evening"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:34:24
+  --> $DIR/subspan.rs:33:24
    |
 LL | subspan!("how are you this evening"); //~ ERROR found 'hi's
    |                        ^^
 
 error: found 'hi's
-  --> $DIR/subspan.rs:35:1
+  --> $DIR/subspan.rs:34:1
    |
 LL | subspan!("this is highly eradic"); //~ ERROR found 'hi's
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
-  --> $DIR/subspan.rs:35:12
+  --> $DIR/subspan.rs:34:12
    |
 LL | subspan!("this is highly eradic"); //~ ERROR found 'hi's
    |            ^^     ^^