Skip to content

Commit 0847d52

Browse files
committed
auto merge of #5450 : pcwalton/rust/warnings, r=graydon
r? @graydon
2 parents 63a292f + e72d011 commit 0847d52

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

src/librustc/middle/trans/base.rs

+3-3
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 => error!("invoke at ???"),
807+
None => debug!("invoke at ???"),
808808
Some(node_info) => {
809-
error!("invoke at %s",
809+
debug!("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) { error!("%s", ty_to_str(ccx.tcx, t)); }
1515+
if ty::type_has_params(t) { debug!("%s", ty_to_str(ccx.tcx, t)); }
15161516
fail_unless!(!ty::type_has_params(t));
15171517
let val = alloca(bcx, llty);
15181518
return val;

src/librusti/rusti.rc

+4
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,10 @@ 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+
389393
unsafe {
390394
do rl::complete |line, suggest| {
391395
if line.starts_with(":") {

src/librustpkg/rustpkg.rc

+3
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,9 @@ 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+
870873
let args = os::args();
871874
let opts = ~[getopts::optflag(~"h"), getopts::optflag(~"help"),
872875
getopts::optflag(~"j"), getopts::optflag(~"json"),

0 commit comments

Comments
 (0)