bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #14168 : zwarich/rust/deriving-clone, r=alexcrichton

Browse source
This commit is contained in:
bors 2014-05-13 06:11:45 -07:00
commit 04c23d3fc1
2 changed files with 3 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc/middle/borrowck/mod.rs
View file

@ -49,16 +49,9 @@ pub mod gather_loans;
pub mod move_data; pub mod move_data;
#[deriving(Clone)]
pub struct LoanDataFlowOperator; pub struct LoanDataFlowOperator;
/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// yet on unit structs.
impl Clone for LoanDataFlowOperator {
fn clone(&self) -> LoanDataFlowOperator {
LoanDataFlowOperator
}
}
pub type LoanDataFlow<'a> = DataFlowContext<'a, LoanDataFlowOperator>; pub type LoanDataFlow<'a> = DataFlowContext<'a, LoanDataFlowOperator>;
impl<'a> Visitor<()> for BorrowckCtxt<'a> { impl<'a> Visitor<()> for BorrowckCtxt<'a> {

18
src/librustc/middle/borrowck/move_data.rs
View file

@ -147,28 +147,14 @@ pub struct Assignment {
pub span: Span, pub span: Span,
} }
#[deriving(Clone)]
pub struct MoveDataFlowOperator; pub struct MoveDataFlowOperator;
/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// yet on unit structs.
impl Clone for MoveDataFlowOperator {
fn clone(&self) -> MoveDataFlowOperator {
MoveDataFlowOperator
}
}
pub type MoveDataFlow<'a> = DataFlowContext<'a, MoveDataFlowOperator>; pub type MoveDataFlow<'a> = DataFlowContext<'a, MoveDataFlowOperator>;
#[deriving(Clone)]
pub struct AssignDataFlowOperator; pub struct AssignDataFlowOperator;
/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// yet on unit structs.
impl Clone for AssignDataFlowOperator {
fn clone(&self) -> AssignDataFlowOperator {
AssignDataFlowOperator
}
}
pub type AssignDataFlow<'a> = DataFlowContext<'a, AssignDataFlowOperator>; pub type AssignDataFlow<'a> = DataFlowContext<'a, AssignDataFlowOperator>;
impl MoveData { impl MoveData {