add a series of tests for changes to structs

These tests reveal that the edges are in some cases
too strict.
This commit is contained in:
Niko Matsakis 2016-05-24 15:50:24 -04:00
parent 298730e703
commit be1819f14b
7 changed files with 326 additions and 0 deletions

View File

@ -0,0 +1,48 @@
// 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 incremental compilation tracking where we change field names
// in between revisions (hashing should be stable).
// revisions:rpass1 rpass2
#![feature(rustc_attrs)]
pub struct X {
pub x: u32,
#[cfg(rpass2)]
pub x2: u32,
}
pub struct EmbedX {
x: X
}
pub struct Y {
pub y: char
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_X(x: X) -> u32 {
x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_EmbedX(embed: EmbedX) -> u32 {
embed.x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")] // FIXME(#33850) should be clean
pub fn use_Y() {
let x: Y = Y { y: 'c' };
}
pub fn main() { }

View File

@ -0,0 +1,55 @@
// 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 incremental compilation tracking where we change field names
// in between revisions (hashing should be stable).
// revisions:rpass1 cfail2
#![feature(rustc_attrs)]
#[cfg(rpass1)]
pub struct X {
pub x: u32
}
#[cfg(cfail2)]
pub struct X {
pub y: u32
}
pub struct EmbedX {
x: X
}
pub struct Y {
pub y: char
}
#[rustc_dirty(label="TypeckItemBody", cfg="cfail2")]
pub fn use_X() -> u32 {
let x: X = X { x: 22 };
//[cfail2]~^ ERROR structure `X` has no field named `x`
x.x as u32
//[cfail2]~^ ERROR attempted access of field `x`
}
#[rustc_dirty(label="TypeckItemBody", cfg="cfail2")]
pub fn use_EmbedX(embed: EmbedX) -> u32 {
embed.x.x as u32
//[cfail2]~^ ERROR attempted access of field `x`
}
#[rustc_dirty(label="TypeckItemBody", cfg="cfail2")] // FIXME(#33850) should be clean
pub fn use_Y() {
let x: Y = Y { y: 'c' };
}
pub fn main() { }

View File

@ -0,0 +1,53 @@
// 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 incremental compilation tracking where we change nothing
// in between revisions (hashing should be stable).
// revisions:rpass1 rpass2
#![feature(rustc_attrs)]
#[cfg(rpass1)]
pub struct X {
pub x: u32
}
#[cfg(rpass2)]
pub struct X {
pub x: i32
}
pub struct EmbedX {
x: X
}
pub struct Y {
pub y: char
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_X() -> u32 {
let x: X = X { x: 22 };
x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_EmbedX(x: EmbedX) -> u32 {
let x: X = X { x: 22 };
x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")] // FIXME(#33850) should be clean
pub fn use_Y() {
let x: Y = Y { y: 'c' };
}
pub fn main() { }

View File

@ -0,0 +1,29 @@
// 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.
#![crate_type="rlib"]
#[cfg(rpass1)]
pub struct X {
pub x: u32
}
#[cfg(rpass2)]
pub struct X {
pub x: i32
}
pub struct EmbedX {
pub x: X
}
pub struct Y {
pub y: char
}

View File

@ -0,0 +1,36 @@
// 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.
// aux-build:a.rs
// revisions:rpass1 rpass2
#![feature(rustc_attrs)]
extern crate a;
use a::*;
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_X() -> u32 {
let x: X = X { x: 22 };
x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_EmbedX(embed: EmbedX) -> u32 {
embed.x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")] // FIXME(#33850) should be clean
pub fn use_Y() {
let x: Y = Y { y: 'c' };
}
pub fn main() { }

View File

@ -0,0 +1,53 @@
// 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 incremental compilation tracking where we change nothing
// in between revisions (hashing should be stable).
// revisions:rpass1 rpass2
#![feature(rustc_attrs)]
#[cfg(rpass1)]
pub struct X {
pub x: u32
}
#[cfg(rpass2)]
pub struct X {
pub x: u32
}
pub struct EmbedX {
x: X
}
pub struct Y {
pub y: char
}
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
pub fn use_X() -> u32 {
let x: X = X { x: 22 };
x.x as u32
}
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
pub fn use_EmbedX(x: EmbedX) -> u32 {
let x: X = X { x: 22 };
x.x as u32
}
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
pub fn use_Y() {
let x: Y = Y { y: 'c' };
}
pub fn main() { }

View File

@ -0,0 +1,52 @@
// 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 incremental compilation tracking where we change field names
// in between revisions (hashing should be stable).
// revisions:rpass1 rpass2
#![feature(rustc_attrs)]
#[cfg(rpass1)]
pub struct X {
pub x: u32,
pub x2: u32,
}
#[cfg(rpass2)]
pub struct X {
pub x: u32,
}
pub struct EmbedX {
x: X
}
pub struct Y {
pub y: char
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_X(x: X) -> u32 {
x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
pub fn use_EmbedX(embed: EmbedX) -> u32 {
embed.x.x as u32
}
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")] // FIXME(#33850) should be clean
pub fn use_Y() {
let x: Y = Y { y: 'c' };
}
pub fn main() { }