Rollup merge of #29933 - tbu-:pr_dont_opt_in_copy, r=nikomatsakis

steveklabnik · steveklabnik · commit ff8859880ba0 · 2015-11-24T09:43:46.000-05:00
It was introduced with the change that made copy opt-in. The
implementation gives a warning, because the struct contains a raw
pointer.
diff --git a/src/librustc_llvm/diagnostic.rs b/src/librustc_llvm/diagnostic.rs
@@ -37,7 +37,6 @@ impl OptimizationDiagnosticKind {
     }
 }
 
-#[derive(Copy, Clone)]
 pub struct OptimizationDiagnostic {
     pub kind: OptimizationDiagnosticKind,
     pub pass_name: *const c_char,
@@ -94,7 +93,6 @@ impl InlineAsmDiagnostic {
     }
 }
 
-#[derive(Copy, Clone)]
 pub enum Diagnostic {
     Optimization(OptimizationDiagnostic),
     InlineAsm(InlineAsmDiagnostic),

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ impl OptimizationDiagnosticKind {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-#[derive(Copy, Clone)]`
`41`	`40`	`pub struct OptimizationDiagnostic {`
`42`	`41`	`pub kind: OptimizationDiagnosticKind,`
`43`	`42`	`pub pass_name: *const c_char,`
`@@ -94,7 +93,6 @@ impl InlineAsmDiagnostic {`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
`97`		`-#[derive(Copy, Clone)]`
`98`	`96`	`pub enum Diagnostic {`
`99`	`97`	`Optimization(OptimizationDiagnostic),`
`100`	`98`	`InlineAsm(InlineAsmDiagnostic),`