dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto merge of #14066 : edwardw/rust/pod-to-copy, r=alexcrichton 

Some error messages still use the word `Pod` instead of `Copy`. Renames
them.
This commit is contained in:
bors 2014-05-10 02:11:32 -07:00
parent a7d877ce62 0f25aad746
commit 061450dcf1
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc/util/ppaux.rs
View File

@ -584,7 +584,7 @@ impl Repr for ty::ParamBounds {
ty::BoundStatic => "'static".to_owned(),
ty::BoundSend => "Send".to_owned(),
ty::BoundSized => "Sized".to_owned(),
ty::BoundCopy => "Pod".to_owned(),
ty::BoundCopy => "Copy".to_owned(),
ty::BoundShare => "Share".to_owned(),
});
}
@ -862,7 +862,7 @@ impl UserString for ty::BuiltinBound {
ty::BoundStatic => "'static".to_owned(),
ty::BoundSend => "Send".to_owned(),
ty::BoundSized => "Sized".to_owned(),
ty::BoundCopy => "Pod".to_owned(),
ty::BoundCopy => "Copy".to_owned(),
ty::BoundShare => "Share".to_owned(),
}
}

17
src/test/compile-fail/error-should-say-copy-not-pod.rs Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2012-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.
// Tests that the error message uses the word Copy, not Pod.
fn check_bound<T:Copy>(_: T) {}
fn main() {
check_bound("nocopy".to_owned()); //~ ERROR does not fulfill `Copy`
}