---

yaml
---
r: 40391
b: refs/heads/dist-snap
c: 59a034a
h: refs/heads/master
i:
  40389: 5eb4861
  40387: df7acbd
  40383: 300d22f
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: adc4bed773ea6af7343a5a6bbe46e288367fecee
+refs/heads/dist-snap: 59a034a63fee084d503625d79ff986d0c12d1eaf
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/core.rs

@@ -54,23 +54,23 @@ pub use coreops::ops::{Shl, Shr, Index};
 // warn-and-below.
 
 /// The error log level
-pub const error : u32 = 0_u32;
+pub const error : u32 = 1_u32;
 /// The warning log level
-pub const warn : u32 = 1_u32;
+pub const warn : u32 = 2_u32;
 /// The info log level
-pub const info : u32 = 2_u32;
+pub const info : u32 = 3_u32;
 /// The debug log level
-pub const debug : u32 = 3_u32;
+pub const debug : u32 = 4_u32;
 
 // A curious inner-module that's not exported that contains the binding
 // 'core' so that macro-expanded references to core::error and such
 // can be resolved within libcore.
 #[doc(hidden)] // FIXME #3538
 mod core {
-    pub const error : u32 = 0_u32;
-    pub const warn : u32 = 1_u32;
-    pub const info : u32 = 2_u32;
-    pub const debug : u32 = 3_u32;
+    pub const error : u32 = 1_u32;
+    pub const warn : u32 = 2_u32;
+    pub const info : u32 = 3_u32;
+    pub const debug : u32 = 4_u32;
 }
 
 // Similar to above. Some magic to make core testable.

branches/dist-snap/src/librustc/rustc.rs

@@ -222,7 +222,7 @@ fn monitor(+f: fn~(diagnostic::emitter)) {
                 for [
                     ~"the compiler hit an unexpected failure path. \
                      this is a bug",
-                    ~"try running with RUST_LOG=rustc=0,::rt::backtrace \
+                    ~"try running with RUST_LOG=rustc=1,::rt::backtrace \
                      to get further details and report the results \
                      to github.com/mozilla/rust/issues"
                 ].each |note| {

branches/dist-snap/src/rt/rust_log.cpp

@@ -168,7 +168,7 @@ struct log_directive {
 
 const size_t max_log_directives = 255;
 const size_t max_log_level = 255;
-const size_t default_log_level = 0;
+const size_t default_log_level = log_err;
 
 // This is a rather ugly parser for strings in the form
 // "crate1,crate2.mod3,crate3.x=1". Log levels are 0-255,

branches/dist-snap/src/rt/rust_log.h

@@ -4,10 +4,10 @@
 
 #include "rust_globals.h"
 
-const uint32_t log_err = 0;
-const uint32_t log_warn = 1;
-const uint32_t log_info = 2;
-const uint32_t log_debug = 3;
+const uint32_t log_err = 1;
+const uint32_t log_warn = 2;
+const uint32_t log_info = 3;
+const uint32_t log_debug = 4;
 
 #define LOG(task, field, ...)                                   \
     DLOG_LVL(log_debug, task, task->sched_loop, field, __VA_ARGS__)