Skip to content

Commit 8dbe79a

Browse files
committed
Fix fallout in tests.
1 parent 9c7969d commit 8dbe79a

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/test/pretty/issue-4264.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141

4242
((::fmt::format as
43-
for<'r> fn(std::fmt::Arguments<'r>) -> std::string::String {std::fmt::format})(((<::std::fmt::Arguments>::new_v1
43+
for<'r> fn(std::fmt::Arguments<'r>) -> std::string::String {std::fmt::format})(((<::fmt::Arguments>::new_v1
4444
as
4545
fn(&[&str], &[std::fmt::ArgumentV1<'_>]) -> std::fmt::Arguments<'_> {std::fmt::Arguments<'_>::new_v1})((&([("test"
4646
as

src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn expand_deriving_partial_eq(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, it
6969
let trait_def = TraitDef {
7070
span: span,
7171
attributes: Vec::new(),
72-
path: deriving::generic::ty::Path::new(vec!["std", "cmp", "PartialEq"]),
72+
path: deriving::generic::ty::Path::new(vec!["cmp", "PartialEq"]),
7373
additional_bounds: Vec::new(),
7474
generics: LifetimeBounds::empty(),
7575
is_unsafe: false,

src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn expand(cx: &mut ExtCtxt,
5050
let trait_def = TraitDef {
5151
span: span,
5252
attributes: vec![],
53-
path: Path::new(vec!["TotalSum"]),
53+
path: Path::new_local("TotalSum"),
5454
additional_bounds: vec![],
5555
generics: LifetimeBounds::empty(),
5656
associated_types: vec![],

src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn expand(cx: &mut ExtCtxt,
4646
let trait_def = TraitDef {
4747
span: span,
4848
attributes: vec![],
49-
path: Path::new(vec!["TotalSum"]),
49+
path: Path::new_local("TotalSum"),
5050
additional_bounds: vec![],
5151
generics: LifetimeBounds::empty(),
5252
associated_types: vec![],

src/test/compile-fail-fulldeps/derive-no-std-not-supported.rs renamed to src/test/run-pass-fulldeps/derive-no-std-not-supported.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![feature(rustc_private)]
1112
#![no_std]
1213

1314
extern crate serialize as rustc_serialize;
1415

15-
#[derive(RustcEncodable)] //~ ERROR this trait cannot be derived
16+
#[derive(RustcEncodable)]
1617
struct Bar {
1718
x: u32,
1819
}
1920

20-
#[derive(RustcDecodable)] //~ ERROR this trait cannot be derived
21+
#[derive(RustcDecodable)]
2122
struct Baz {
2223
x: u32,
2324
}
2425

2526
fn main() {
26-
Foo { x: 0 };
2727
Bar { x: 0 };
2828
Baz { x: 0 };
2929
}

0 commit comments

Comments
 (0)