diff options
| author | bors <bors@rust-lang.org> | 2014-01-10 18:21:21 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-10 18:21:21 -0800 |
| commit | a34727f27657cbed71fb2326dc6f1766fee95a4c (patch) | |
| tree | f6f124acf2ae8f6ab5808ce3ddb7c99a6cd35285 /src/libsyntax | |
| parent | 5a6ca45c8ad26f1ace1c46e6452155d511d065d8 (diff) | |
| parent | 4fc0452acef1355ba566a30c5bd04ccd3b9acef2 (diff) | |
| download | rust-a34727f27657cbed71fb2326dc6f1766fee95a4c.tar.gz rust-a34727f27657cbed71fb2326dc6f1766fee95a4c.zip | |
auto merge of #11416 : bjz/rust/remove-print-fns, r=alexcrichton
The `print!` and `println!` macros are now the preferred method of printing, and so there is no reason to export the `stdio` functions in the prelude. The functions have also been replaced by their macro counterparts in the tutorial and other documentation so that newcomers don't get confused about what they should be using.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast_util.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/ext/log_syntax.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index bcac69c188a..c8c9cb4d247 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -1127,7 +1127,7 @@ mod test { // - two renames of the same var.. can only happen if you use // local-expand to prevent the inner binding from being renamed // during the rename-pass caused by the first: - println("about to run bad test"); + println!("about to run bad test"); { let sc = unfold_test_sc(~[R(id(a,EMPTY_CTXT),50), R(id(a,EMPTY_CTXT),51)], EMPTY_CTXT,&mut t); diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 75c0371f625..a9cf807ff65 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1283,7 +1283,7 @@ mod test { //fn expand_and_resolve(crate_str: @str) -> ast::crate { //let expanded_ast = expand_crate_str(crate_str); - // println(format!("expanded: {:?}\n",expanded_ast)); + // println!("expanded: {:?}\n",expanded_ast); //mtwt_resolve_crate(expanded_ast) //} //fn expand_and_resolve_and_pretty_print (crate_str : @str) -> ~str { @@ -1396,7 +1396,7 @@ mod test { let varref_marks = mtwt_marksof(varref.segments[0].identifier.ctxt, invalid_name); if (!(varref_name==binding_name)){ - println("uh oh, should match but doesn't:"); + println!("uh oh, should match but doesn't:"); println!("varref: {:?}",varref); println!("binding: {:?}", bindings[binding_idx]); ast_util::display_sctable(get_sctable()); @@ -1458,7 +1458,7 @@ foo_module!() && (@"xx" == (ident_to_str(&p.segments[0].identifier))) }).enumerate() { if (mtwt_resolve(v.segments[0].identifier) != resolved_binding) { - println("uh oh, xx binding didn't match xx varref:"); + println!("uh oh, xx binding didn't match xx varref:"); println!("this is xx varref \\# {:?}",idx); println!("binding: {:?}",cxbind); println!("resolves to: {:?}",resolved_binding); @@ -1466,7 +1466,7 @@ foo_module!() println!("resolves to: {:?}", mtwt_resolve(v.segments[0].identifier)); let table = get_sctable(); - println("SC table:"); + println!("SC table:"); { let table = table.table.borrow(); diff --git a/src/libsyntax/ext/log_syntax.rs b/src/libsyntax/ext/log_syntax.rs index 74032095840..947e8271f88 100644 --- a/src/libsyntax/ext/log_syntax.rs +++ b/src/libsyntax/ext/log_syntax.rs @@ -21,7 +21,7 @@ pub fn expand_syntax_ext(cx: &mut ExtCtxt, -> base::MacResult { cx.print_backtrace(); - println( + println!("{}", print::pprust::tt_to_str( &ast::TTDelim(@tt.to_owned()), get_ident_interner())); diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 9304b842294..4cd64331f9a 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -983,7 +983,7 @@ mod test { #[test] fn t1 () { let Env {string_reader} = setup(@"/* my source file */ \ - fn main() { io::println(~\"zebra\"); }\n"); + fn main() { println!(\"zebra\"); }\n"); let id = str_to_ident("fn"); let tok1 = string_reader.next_token(); let tok2 = TokenAndSpan{ |
