Skip to content

Commit 98af363

Browse files
committed
---
yaml --- r: 48851 b: refs/heads/snap-stage3 c: 373504a h: refs/heads/master i: 48849: a6f2c9f 48847: bab92ee v: v3
1 parent 26f2fc8 commit 98af363

File tree

8 files changed

+21
-39
lines changed

8 files changed

+21
-39
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ab8e46b0660e076e629e6775ed8da9890c5fbf1f
4+
refs/heads/snap-stage3: 373504a7ac6801293ae65316625ace667842f5b8
55
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/base.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,9 +804,9 @@ pub fn invoke(bcx: block, llfn: ValueRef, +llargs: ~[ValueRef]) -> block {
804804
if bcx.unreachable { return bcx; }
805805

806806
match bcx.node_info {
807-
None => debug!("invoke at ???"),
807+
None => error!("invoke at ???"),
808808
Some(node_info) => {
809-
debug!("invoke at %s",
809+
error!("invoke at %s",
810810
bcx.sess().codemap.span_to_str(node_info.span));
811811
}
812812
}
@@ -1512,7 +1512,7 @@ pub fn alloc_ty(bcx: block, t: ty::t) -> ValueRef {
15121512
let _icx = bcx.insn_ctxt("alloc_ty");
15131513
let ccx = bcx.ccx();
15141514
let llty = type_of::type_of(ccx, t);
1515-
if ty::type_has_params(t) { debug!("%s", ty_to_str(ccx.tcx, t)); }
1515+
if ty::type_has_params(t) { error!("%s", ty_to_str(ccx.tcx, t)); }
15161516
fail_unless!(!ty::type_has_params(t));
15171517
let val = alloca(bcx, llty);
15181518
return val;

branches/snap-stage3/src/librusti/rusti.rc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,6 @@ pub fn main() {
386386
stmts: ~""
387387
};
388388

389-
io::println("WARNING: The Rust REPL is experimental and may be");
390-
io::println("unstable. If you encounter problems, please use the");
391-
io::println("compiler instead.");
392-
393389
unsafe {
394390
do rl::complete |line, suggest| {
395391
if line.starts_with(":") {

branches/snap-stage3/src/librustpkg/rustpkg.rc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -867,9 +867,6 @@ impl Ctx {
867867
}
868868

869869
pub fn main() {
870-
io::println("WARNING: The Rust package manager is experimental and may");
871-
io::println("be unstable.");
872-
873870
let args = os::args();
874871
let opts = ~[getopts::optflag(~"h"), getopts::optflag(~"help"),
875872
getopts::optflag(~"j"), getopts::optflag(~"json"),

branches/snap-stage3/src/libsyntax/ext/expand.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -464,15 +464,6 @@ pub fn core_macros() -> ~str {
464464
}
465465
)
466466

467-
macro_rules! assert_eq (
468-
($given:expr , $expected:expr) =>
469-
({let given_val = $given;
470-
let expected_val = $expected;
471-
// check both directions of equality....
472-
if !((given_val == expected_val) && (expected_val == given_val)) {
473-
fail!(fmt!(\"expected: %?, given: %?\",expected_val,given_val));
474-
}}))
475-
476467
macro_rules! condition (
477468

478469
{ $c:ident: $in:ty -> $out:ty; } => {
@@ -490,7 +481,6 @@ pub fn core_macros() -> ~str {
490481
}
491482
)
492483

493-
494484
}";
495485
}
496486

branches/snap-stage3/src/test/run-fail/assert-eq-macro-fail.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

branches/snap-stage3/src/test/run-pass/assert-eq-macro-success.rs

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
fn main()
12+
{
13+
unsafe {
14+
libc::exit(0);
15+
}
16+
error!("ack");
17+
}

0 commit comments

Comments
 (0)