From ac774e7a5bb7a404ddb26e2e9b9e6932cb31e1b6 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 26 Jan 2018 06:48:38 -0800
Subject: Shorten another test path for MSVC

---
 .../trait_inheritance_cross_trait_call_xc_aux.rs   | 22 ----------------------
 src/test/run-pass/auxiliary/trait_xc_call_aux.rs   | 22 ++++++++++++++++++++++
 .../trait-inheritance-cross-trait-call-xc.rs       |  4 ++--
 3 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs
 create mode 100644 src/test/run-pass/auxiliary/trait_xc_call_aux.rs

(limited to 'src')

diff --git a/src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs
deleted file mode 100644
index 9eeb815c5de..00000000000
--- a/src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012 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 trait Foo {
-    fn f(&self) -> isize;
-}
-
-pub struct A {
-    pub x: isize
-}
-
-impl Foo for A {
-    fn f(&self) -> isize { 10 }
-}
diff --git a/src/test/run-pass/auxiliary/trait_xc_call_aux.rs b/src/test/run-pass/auxiliary/trait_xc_call_aux.rs
new file mode 100644
index 00000000000..9eeb815c5de
--- /dev/null
+++ b/src/test/run-pass/auxiliary/trait_xc_call_aux.rs
@@ -0,0 +1,22 @@
+// Copyright 2012 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 trait Foo {
+    fn f(&self) -> isize;
+}
+
+pub struct A {
+    pub x: isize
+}
+
+impl Foo for A {
+    fn f(&self) -> isize { 10 }
+}
diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
index e1610c1db07..3e68bea57c6 100644
--- a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
+++ b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:trait_inheritance_cross_trait_call_xc_aux.rs
+// aux-build:trait_xc_call_aux.rs
 
 
-extern crate trait_inheritance_cross_trait_call_xc_aux as aux;
+extern crate trait_xc_call_aux as aux;
 
 use aux::Foo;
 
-- 
cgit 1.4.1-3-g733a5