rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #20481: seanmonstar/fmt-show-string

Browse Source 
Conflicts:
	src/compiletest/runtest.rs
	src/libcore/fmt/mod.rs
	src/libfmt_macros/lib.rs
	src/libregex/parse.rs
	src/librustc/middle/cfg/construct.rs
	src/librustc/middle/dataflow.rs
	src/librustc/middle/infer/higher_ranked/mod.rs
	src/librustc/middle/ty.rs
	src/librustc_back/archive.rs
	src/librustc_borrowck/borrowck/fragments.rs
	src/librustc_borrowck/borrowck/gather_loans/mod.rs
	src/librustc_resolve/lib.rs
	src/librustc_trans/back/link.rs
	src/librustc_trans/save/mod.rs
	src/librustc_trans/trans/base.rs
	src/librustc_trans/trans/callee.rs
	src/librustc_trans/trans/common.rs
	src/librustc_trans/trans/consts.rs
	src/librustc_trans/trans/controlflow.rs
	src/librustc_trans/trans/debuginfo.rs
	src/librustc_trans/trans/expr.rs
	src/librustc_trans/trans/monomorphize.rs
	src/librustc_typeck/astconv.rs
	src/librustc_typeck/check/method/mod.rs
	src/librustc_typeck/check/mod.rs
	src/librustc_typeck/check/regionck.rs
	src/librustc_typeck/collect.rs
	src/libsyntax/ext/format.rs
	src/libsyntax/ext/source_util.rs
	src/libsyntax/ext/tt/transcribe.rs
	src/libsyntax/parse/mod.rs
	src/libsyntax/parse/token.rs
	src/test/run-pass/issue-8898.rs
This commit is contained in:
Alex Crichton
2015-01-06 15:22:24 -08:00
parent 5f27b50080 44440e5c18
commit 5c3ddcb15d
252 changed files with 2703 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcoretest/any.rs
View File

@@ -56,12 +56,12 @@ fn any_downcast_ref() {
match a.downcast_ref::<uint>() {
Some(&5) => {}
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
match a.downcast_ref::<Test>() {
None => {}
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
}
@@ -79,7 +79,7 @@ fn any_downcast_mut() {
assert_eq!(*x, 5u);
*x = 612;
}
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
match b_r.downcast_mut::<uint>() {
@@ -87,27 +87,27 @@ fn any_downcast_mut() {
assert_eq!(*x, 7u);
*x = 413;
}
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
match a_r.downcast_mut::<Test>() {
None => (),
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
match b_r.downcast_mut::<Test>() {
None => (),
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
match a_r.downcast_mut::<uint>() {
Some(&612) => {}
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
match b_r.downcast_mut::<uint>() {
Some(&413) => {}
x => panic!("Unexpected value {}", x)
x => panic!("Unexpected value {:?}", x)
}
}

8
src/libcoretest/cell.rs
View File

@@ -29,10 +29,10 @@ fn smoketest_cell() {
#[test]
fn cell_has_sensible_show() {
let x = Cell::new("foo bar");
assert!(format!("{}", x).contains(x.get()));
assert!(format!("{:?}", x).contains(x.get()));
x.set("baz qux");
assert!(format!("{}", x).contains(x.get()));
assert!(format!("{:?}", x).contains(x.get()));
}
#[test]
@@ -40,11 +40,11 @@ fn ref_and_refmut_have_sensible_show() {
let refcell = RefCell::new("foo");
let refcell_refmut = refcell.borrow_mut();
assert!(format!("{}", refcell_refmut).contains("foo"));
assert!(format!("{:?}", refcell_refmut).contains("foo"));
drop(refcell_refmut);
let refcell_ref = refcell.borrow();
assert!(format!("{}", refcell_ref).contains("foo"));
assert!(format!("{:?}", refcell_ref).contains("foo"));
drop(refcell_ref);
}

24
src/libcoretest/fmt/num.rs
View File

@@ -26,6 +26,11 @@ fn test_format_int() {
assert!(format!("{}", -1i16) == "-1");
assert!(format!("{}", -1i32) == "-1");
assert!(format!("{}", -1i64) == "-1");
assert!(format!("{:?}", 1i) == "1i");
assert!(format!("{:?}", 1i8) == "1i8");
assert!(format!("{:?}", 1i16) == "1i16");
assert!(format!("{:?}", 1i32) == "1i32");
assert!(format!("{:?}", 1i64) == "1i64");
assert!(format!("{:b}", 1i) == "1");
assert!(format!("{:b}", 1i8) == "1");
assert!(format!("{:b}", 1i16) == "1");
@@ -52,6 +57,11 @@ fn test_format_int() {
assert!(format!("{}", 1u16) == "1");
assert!(format!("{}", 1u32) == "1");
assert!(format!("{}", 1u64) == "1");
assert!(format!("{:?}", 1u) == "1u");
assert!(format!("{:?}", 1u8) == "1u8");
assert!(format!("{:?}", 1u16) == "1u16");
assert!(format!("{:?}", 1u32) == "1u32");
assert!(format!("{:?}", 1u64) == "1u64");
assert!(format!("{:b}", 1u) == "1");
assert!(format!("{:b}", 1u8) == "1");
assert!(format!("{:b}", 1u16) == "1");
@@ -84,12 +94,14 @@ fn test_format_int() {
#[test]
fn test_format_int_zero() {
assert!(format!("{}", 0i) == "0");
assert!(format!("{:?}", 0i) == "0i");
assert!(format!("{:b}", 0i) == "0");
assert!(format!("{:o}", 0i) == "0");
assert!(format!("{:x}", 0i) == "0");
assert!(format!("{:X}", 0i) == "0");
assert!(format!("{}", 0u) == "0");
assert!(format!("{:?}", 0u) == "0u");
assert!(format!("{:b}", 0u) == "0");
assert!(format!("{:o}", 0u) == "0");
assert!(format!("{:x}", 0u) == "0");
@@ -183,6 +195,12 @@ mod uint {
b.iter(|| { format!("{:x}", rng.gen::<uint>()); })
}
#[bench]
fn format_show(b: &mut Bencher) {
let mut rng = weak_rng();
b.iter(|| { format!("{:?}", rng.gen::<uint>()); })
}
#[bench]
fn format_base_36(b: &mut Bencher) {
let mut rng = weak_rng();
@@ -219,6 +237,12 @@ mod int {
b.iter(|| { format!("{:x}", rng.gen::<int>()); })
}
#[bench]
fn format_show(b: &mut Bencher) {
let mut rng = weak_rng();
b.iter(|| { format!("{:?}", rng.gen::<int>()); })
}
#[bench]
fn format_base_36(b: &mut Bencher) {
let mut rng = weak_rng();

8
src/libcoretest/result.rs
View File

@@ -95,10 +95,10 @@ pub fn test_fmt_default() {
let ok: Result<int, &'static str> = Ok(100);
let err: Result<int, &'static str> = Err("Err");
let s = format!("{}", ok);
assert_eq!(s, "Ok(100)");
let s = format!("{}", err);
assert_eq!(s, "Err(Err)");
let s = format!("{:?}", ok);
assert_eq!(s, "Ok(100i)");
let s = format!("{:?}", err);
assert_eq!(s, "Err(\"Err\")");
}
#[test]

12
src/libcoretest/tuple.rs
View File

@@ -59,10 +59,10 @@ fn test_tuple_cmp() {
#[test]
fn test_show() {
let s = format!("{}", (1i,));
assert_eq!(s, "(1,)");
let s = format!("{}", (1i, true));
assert_eq!(s, "(1, true)");
let s = format!("{}", (1i, "hi", true));
assert_eq!(s, "(1, hi, true)");
let s = format!("{:?}", (1i,));
assert_eq!(s, "(1i,)");
let s = format!("{:?}", (1i, true));
assert_eq!(s, "(1i, true)");
let s = format!("{:?}", (1i, "hi", true));
assert_eq!(s, "(1i, \"hi\", true)");
}