Skip to content

Commit

Permalink
add test for changing pub inherent method body
Browse files Browse the repository at this point in the history
Ideally, callers should not be affected, but they currently are.
  • Loading branch information
nikomatsakis committed Nov 18, 2016
1 parent 01d061f commit a488979
Showing 1 changed file with 107 additions and 0 deletions.
107 changes: 107 additions & 0 deletions src/test/incremental/change_pub_inherent_method_body/struct_point.rs
@@ -0,0 +1,107 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Test where we change the body of a private method in an impl.
// We then test what sort of functions must be rebuilt as a result.

// revisions:rpass1 rpass2
// compile-flags: -Z query-dep-graph

#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
#![allow(dead_code)]

#![rustc_partition_translated(module="struct_point-point", cfg="rpass2")]

// FIXME(#35078) -- this gets recompiled because we don't separate sig from body
#![rustc_partition_translated(module="struct_point-fn_calls_changed_method", cfg="rpass2")]
// FIXME(#36349) -- this gets recompiled because we don't separate items from impl
#![rustc_partition_translated(module="struct_point-fn_calls_another_method", cfg="rpass2")]
#![rustc_partition_reused(module="struct_point-fn_make_struct", cfg="rpass2")]
#![rustc_partition_reused(module="struct_point-fn_read_field", cfg="rpass2")]
#![rustc_partition_reused(module="struct_point-fn_write_field", cfg="rpass2")]

mod point {
pub struct Point {
pub x: f32,
pub y: f32,
}

impl Point {
pub fn distance_from_origin(&self) -> f32 {
#[cfg(rpass1)]
return self.x * self.x + self.y * self.y;

#[cfg(rpass2)]
return (self.x * self.x + self.y * self.y).sqrt();
}

pub fn x(&self) -> f32 {
self.x
}
}
}

/// A fn item that calls (public) methods on `Point` from the same impl which changed
mod fn_calls_changed_method {
use point::Point;

// FIXME(#35078) -- this gets recompiled because we don't separate sig from body
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn check() {
let p = Point { x: 2.0, y: 2.0 };
p.distance_from_origin();
}
}

/// A fn item that calls (public) methods on `Point` from the same impl which changed
mod fn_calls_another_method {
use point::Point;

// FIXME(#36349) -- this gets recompiled because we don't separate items from impl
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn check() {
let p = Point { x: 2.0, y: 2.0 };
p.x();
}
}

/// A fn item that makes an instance of `Point` but does not invoke methods
mod fn_make_struct {
use point::Point;

#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
pub fn make_origin() -> Point {
Point { x: 2.0, y: 2.0 }
}
}

/// A fn item that reads fields from `Point` but does not invoke methods
mod fn_read_field {
use point::Point;

#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
pub fn get_x(p: Point) -> f32 {
p.x
}
}

/// A fn item that writes to a field of `Point` but does not invoke methods
mod fn_write_field {
use point::Point;

#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
pub fn inc_x(p: &mut Point) {
p.x += 1.0;
}
}

fn main() {
}

0 comments on commit a488979

Please sign in to comment.