rollup merge of #23860: nikomatsakis/copy-requires-clone

Conflicts:
	src/test/compile-fail/coherence-impls-copy.rs
This commit is contained in:
Alex Crichton
2015-04-01 18:37:54 -07:00
224 changed files with 624 additions and 583 deletions

View File

@@ -194,7 +194,7 @@ impl fmt::Debug for TestFn {
/// This is fed into functions marked with `#[bench]` to allow for
/// set-up & tear-down before running a piece of code repeatedly via a
/// call to `iter`.
#[derive(Copy)]
#[derive(Copy, Clone)]
pub struct Bencher {
iterations: u64,
dur: Duration,
@@ -281,7 +281,7 @@ pub fn test_main_static(args: env::Args, tests: &[TestDescAndFn]) {
test_main(&args, owned_tests)
}
#[derive(Copy)]
#[derive(Copy, Clone)]
pub enum ColorConfig {
AutoColor,
AlwaysColor,