Skip to content

Commit 435639c

Browse files
committed
test: Fix fallout in tests
1 parent 1623937 commit 435639c

File tree

112 files changed

+205
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+205
-466
lines changed

src/test/auxiliary/issue_3907.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(core)]
12-
13-
use std::marker::MarkerTrait;
14-
15-
pub trait Foo : MarkerTrait {
11+
pub trait Foo {
1612
fn bar();
1713
}

src/test/auxiliary/private_trait_xc.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(core)]
12-
13-
trait Foo : ::std::marker::MarkerTrait {}
11+
trait Foo {}

src/test/auxiliary/rustdoc-default-impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
pub mod bar {
1515
use std::marker;
1616

17-
pub trait Bar: marker::MarkerTrait + 'static {}
17+
pub trait Bar: 'static {}
1818

1919
impl Bar for .. {}
2020

src/test/auxiliary/svh-a-base.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
//! (#14132).
1515
1616
#![crate_name = "a"]
17-
#![feature(core)]
18-
19-
use std::marker::MarkerTrait;
2017

2118
macro_rules! three {
2219
() => { 3 }
2320
}
2421

25-
pub trait U : MarkerTrait {}
26-
pub trait V : MarkerTrait {}
22+
pub trait U {}
23+
pub trait V {}
2724
impl U for () {}
2825
impl V for () {}
2926

src/test/auxiliary/svh-a-change-lit.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
//! (#14132).
1515
1616
#![crate_name = "a"]
17-
#![feature(core)]
18-
19-
use std::marker::MarkerTrait;
2017

2118
macro_rules! three {
2219
() => { 3 }
2320
}
2421

25-
pub trait U : MarkerTrait {}
26-
pub trait V : MarkerTrait {}
22+
pub trait U {}
23+
pub trait V {}
2724
impl U for () {}
2825
impl V for () {}
2926

src/test/auxiliary/svh-a-change-significant-cfg.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
//! (#14132).
1515
1616
#![crate_name = "a"]
17-
#![feature(core)]
18-
19-
use std::marker::MarkerTrait;
2017

2118
macro_rules! three {
2219
() => { 3 }
2320
}
2421

25-
pub trait U : MarkerTrait {}
26-
pub trait V : MarkerTrait {}
22+
pub trait U {}
23+
pub trait V {}
2724
impl U for () {}
2825
impl V for () {}
2926

src/test/auxiliary/svh-a-change-trait-bound.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
//! (#14132).
1515
1616
#![crate_name = "a"]
17-
#![feature(core)]
18-
19-
use std::marker::MarkerTrait;
2017

2118
macro_rules! three {
2219
() => { 3 }
2320
}
2421

25-
pub trait U : MarkerTrait {}
26-
pub trait V : MarkerTrait {}
22+
pub trait U {}
23+
pub trait V {}
2724
impl U for () {}
2825
impl V for () {}
2926

src/test/auxiliary/svh-a-change-type-arg.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
//! (#14132).
1515
1616
#![crate_name = "a"]
17-
#![feature(core)]
18-
19-
use std::marker::MarkerTrait;
2017

2118
macro_rules! three {
2219
() => { 3 }
2320
}
2421

25-
pub trait U : MarkerTrait {}
26-
pub trait V : MarkerTrait {}
22+
pub trait U {}
23+
pub trait V {}
2724
impl U for () {}
2825
impl V for () {}
2926

src/test/auxiliary/svh-a-change-type-ret.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
//! (#14132).
1515
1616
#![crate_name = "a"]
17-
#![feature(core)]
18-
19-
use std::marker::MarkerTrait;
2017

2118
macro_rules! three {
2219
() => { 3 }
2320
}
2421

25-
pub trait U : MarkerTrait {}
26-
pub trait V : MarkerTrait {}
22+
pub trait U {}
23+
pub trait V {}
2724
impl U for () {}
2825
impl V for () {}
2926

src/test/auxiliary/svh-a-change-type-static.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
#![crate_name = "a"]
1717
#![feature(core)]
1818

19-
use std::marker::MarkerTrait;
20-
2119
macro_rules! three {
2220
() => { 3 }
2321
}
2422

25-
pub trait U : MarkerTrait {}
26-
pub trait V : MarkerTrait {}
23+
pub trait U {}
24+
pub trait V {}
2725
impl U for () {}
2826
impl V for () {}
2927

0 commit comments

Comments
 (0)