---

yaml
---
r: 138977
b: refs/heads/try2
c: 05c1032
h: refs/heads/master
i:
  138975: 75acddc
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: ab5472a7244896df20ceb7a12d9d30afc838f004
+refs/heads/try2: 05c103238d977fe8c5d6b614f21f581069373524
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/rust.md

@@ -212,7 +212,7 @@ do drop
 else enum extern
 false fn for
 if impl
-let loop
+let log loop
 match mod mut
 priv pub pure
 ref return
@@ -805,20 +805,21 @@ Use declarations support a number of "convenience" notations:
 An example of `use` declarations:
 
 ~~~~
+use foo = core::info;
 use core::float::sin;
 use core::str::{slice, to_upper};
 use core::option::Some;
 
 fn main() {
-    // Equivalent to 'info!(core::float::sin(1.0));'
-    info!(sin(1.0));
+    // Equivalent to 'log(core::info, core::float::sin(1.0));'
+    log(foo, sin(1.0));
 
-    // Equivalent to 'info!(core::option::Some(1.0));'
-    info!(Some(1.0));
+    // Equivalent to 'log(core::info, core::option::Some(1.0));'
+    log(info, Some(1.0));
 
-    // Equivalent to
-    // 'info!(core::str::to_upper(core::str::slice("foo", 0, 1)));'
-    info!(to_upper(slice("foo", 0, 1)));
+    // Equivalent to 'log(core::info,
+    //                    core::str::to_upper(core::str::slice("foo", 0, 1)));'
+    log(info, to_upper(slice("foo", 0, 1)));
 }
 ~~~~
 
@@ -989,7 +990,7 @@ output slot type would normally be. For example:
 
 ~~~~
 fn my_err(s: &str) -> ! {
-    info!(s);
+    log(info, s);
     fail!();
 }
 ~~~~
@@ -2396,6 +2397,58 @@ fn max(a: int, b: int) -> int {
 }
 ~~~~
 
+### Log expressions
+
+~~~~~~~~{.ebnf .gram}
+log_expr : "log" '(' level ',' expr ')' ;
+~~~~~~~~
+
+Evaluating a `log` expression may, depending on runtime configuration, cause a
+value to be appended to an internal diagnostic logging buffer provided by the
+runtime or emitted to a system console. Log expressions are enabled or
+disabled dynamically at run-time on a per-task and per-item basis. See
+[logging system](#logging-system).
+
+Each `log` expression must be provided with a *level* argument in
+addition to the value to log. The logging level is a `u32` value, where
+lower levels indicate more-urgent levels of logging. By default, the lowest
+four logging levels (`1_u32 ... 4_u32`) are predefined as the constants
+`error`, `warn`, `info` and `debug` in the `core` library.
+
+Additionally, the macros `error!`, `warn!`, `info!` and `debug!` are defined
+in the default syntax-extension namespace. These expand into calls to the
+logging facility composed with calls to the `fmt!` string formatting
+syntax-extension.
+
+The following examples all produce the same output, logged at the `error`
+logging level:
+
+~~~~
+# let filename = "bulbasaur";
+
+// Full version, logging a value.
+log(core::error, ~"file not found: " + filename);
+
+// Log-level abbreviated, since core::* is used by default.
+log(error, ~"file not found: " + filename);
+
+// Formatting the message using a format-string and fmt!
+log(error, fmt!("file not found: %s", filename));
+
+// Using the error! macro, that expands to the previous call.
+error!("file not found: %s", filename);
+~~~~
+
+A `log` expression is *not evaluated* when logging at the specified logging-level, module or task is disabled at runtime.
+This makes inactive `log` expressions very cheap;
+they should be used extensively in Rust code, as diagnostic aids,
+as they add little overhead beyond a single integer-compare and branch at runtime.
+
+Logging is presently implemented as a language built-in feature,
+as it makes use of compiler-provided, per-module data tables and flags.
+In the future, logging will move into a library, and will no longer be a core expression type.
+It is therefore recommended to use the macro forms of logging (`error!`, `debug!`, etc.) to minimize disruption in code that uses logging.
+
 
 # Type system
 
@@ -3096,7 +3149,7 @@ communication facilities.
 
 The runtime contains a system for directing [logging
 expressions](#log-expressions) to a logging console and/or internal logging
-buffers. Logging can be enabled per module.
+buffers. Logging expressions can be enabled per module.
 
 Logging output is enabled by setting the `RUST_LOG` environment
 variable.  `RUST_LOG` accepts a logging specification made up of a

branches/try2/doc/tutorial.md

@@ -744,7 +744,7 @@ unit, `()`, as the empty tuple if you like).
 ~~~~
 let mytup: (int, int, float) = (10, 20, 30.0);
 match mytup {
-  (a, b, c) => info!(a + b + (c as int))
+  (a, b, c) => log(info, a + b + (c as int))
 }
 ~~~~
 
@@ -760,7 +760,7 @@ For example:
 struct MyTup(int, int, float);
 let mytup: MyTup = MyTup(10, 20, 30.0);
 match mytup {
-  MyTup(a, b, c) => info!(a + b + (c as int))
+  MyTup(a, b, c) => log(info, a + b + (c as int))
 }
 ~~~~
 

branches/try2/mk/tests.mk

@@ -386,10 +386,6 @@ ifeq ($(CFG_GDB),)
 CTEST_DISABLE_debuginfo = "no gdb found"
 endif
 
-ifeq ($(CFG_OSTYPE),apple-darwin)
-CTEST_DISABLE_debuginfo = "gdb on darwing needs root"
-endif
-
 define DEF_CTEST_VARS
 
 # All the per-stage build rules you might want to call from the

branches/try2/src/compiletest/runtest.rs

@@ -225,15 +225,6 @@ actual:\n\
 }
 
 fn run_debuginfo_test(config: config, props: TestProps, testfile: &Path) {
-    // do not optimize debuginfo tests
-    let config = match config.rustcflags {
-        Some(flags) => config {
-            rustcflags: Some(str::replace(flags, ~"-O", ~"")),
-            .. config
-        },
-        None => config
-    };
-
     // compile test file (it shoud have 'compile-flags:-g' in the header)
     let mut ProcRes = compile_test(config, props, testfile);
     if ProcRes.status != 0 {
@@ -276,8 +267,8 @@ fn run_debuginfo_test(config: config, props: TestProps, testfile: &Path) {
             }
         }
         if i != num_check_lines {
-            fatal_ProcRes(fmt!("line not found in debugger output: %s"
-                               props.check_lines[i]), ProcRes);
+            fatal(fmt!("line not found in debugger output: %s",
+                       props.check_lines[i]));
         }
     }
 }

branches/try2/src/compiletest/util.rs

@@ -46,6 +46,6 @@ pub fn path_div() -> ~str { ~":" }
 pub fn path_div() -> ~str { ~";" }
 
 pub fn logv(config: config, s: ~str) {
-    debug!("%s", s);
+    log(debug, s);
     if config.verbose { io::println(s); }
 }

branches/try2/src/etc/tidy.py

@@ -5,7 +5,7 @@
 from licenseck import *
 
 err=0
-cols=78
+cols=100
 
 # Be careful to support Python 2.4, 2.6, and 3.x here!
 config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],

branches/try2/src/libcore/cast.rs

@@ -12,7 +12,7 @@ pub mod rusti {
     #[abi = "rust-intrinsic"]
     #[link_name = "rusti"]
     pub extern {
-        fn forget<T>(+x: T);
+        fn forget<T>(-x: T);
         fn reinterpret_cast<T, U>(&&e: T) -> U;
     }
 }

branches/try2/src/libcore/core.rc

@@ -216,17 +216,14 @@ pub use clone::Clone;
  * more-verbosity. Error is the bottom level, default logging level is
  * warn-and-below.
  */
+
 /// The error log level
-#[cfg(stage0)]
 pub const error : u32 = 1_u32;
 /// The warning log level
-#[cfg(stage0)]
 pub const warn : u32 = 2_u32;
 /// The info log level
-#[cfg(stage0)]
 pub const info : u32 = 3_u32;
 /// The debug log level
-#[cfg(stage0)]
 pub const debug : u32 = 4_u32;
 
 
@@ -254,13 +251,9 @@ pub mod rt;
 // can be resolved within libcore.
 #[doc(hidden)] // FIXME #3538
 pub mod core {
-    #[cfg(stage0)]
     pub const error : u32 = 1_u32;
-    #[cfg(stage0)]
     pub const warn : u32 = 2_u32;
-    #[cfg(stage0)]
     pub const info : u32 = 3_u32;
-    #[cfg(stage0)]
     pub const debug : u32 = 4_u32;
 
     pub use cmp;

branches/try2/src/libcore/io.rs

@@ -683,7 +683,7 @@ impl Writer for *libc::FILE {
                                         *self);
                 if nout != len as size_t {
                     error!("error writing buffer");
-                    error!("%s", os::last_os_error());
+                    log(error, os::last_os_error());
                     fail!();
                 }
             }
@@ -733,7 +733,7 @@ impl Writer for fd_t {
                     let nout = libc::write(*self, vb, len as size_t);
                     if nout < 0 as ssize_t {
                         error!("error writing buffer");
-                        error!("%s", os::last_os_error());
+                        log(error, os::last_os_error());
                         fail!();
                     }
                     count += nout as uint;
@@ -1288,6 +1288,7 @@ pub mod fsync {
 
 #[cfg(test)]
 mod tests {
+    use debug;
     use i32;
     use io::{BytesWriter, SeekCur, SeekEnd, SeekSet};
     use io;
@@ -1300,10 +1301,10 @@ mod tests {
     #[test]
     fn test_simple() {
         let tmpfile = &Path("tmp/lib-io-test-simple.tmp");
-        debug!(tmpfile);
+        log(debug, tmpfile);
         let frood: ~str =
             ~"A hoopy frood who really knows where his towel is.";
-        debug!(copy frood);
+        log(debug, copy frood);
         {
             let out: io::Writer =
                 result::get(
@@ -1312,7 +1313,7 @@ mod tests {
         }
         let inp: io::Reader = result::get(&io::file_reader(tmpfile));
         let frood2: ~str = inp.read_c_str();
-        debug!(copy frood2);
+        log(debug, copy frood2);
         fail_unless!(frood == frood2);
     }
 

branches/try2/src/libcore/libc.rs

@@ -1385,25 +1385,28 @@ pub mod funcs {
             use libc::types::common::posix88::{DIR, dirent_t};
             use libc::types::os::arch::c95::{c_char, c_int, c_long};
 
-            // NOTE: On OS X opendir and readdir have two versions,
-            // one for 32-bit kernelspace and one for 64.
-            // We should be linking to the 64-bit ones, called
-            // opendir$INODE64, etc. but for some reason rustc
-            // doesn't link it correctly on i686, so we're going
-            // through a C function that mysteriously does work.
-            pub unsafe fn opendir(dirname: *c_char) -> *DIR {
-                rust_opendir(dirname)
-            }
-            pub unsafe fn readdir(dirp: *DIR) -> *dirent_t {
-                rust_readdir(dirp)
-            }
-
-            extern {
-                unsafe fn rust_opendir(dirname: *c_char) -> *DIR;
-                unsafe fn rust_readdir(dirp: *DIR) -> *dirent_t;
-            }
-
             pub extern {
+                // default bindings for opendir and readdir in
+                // non-macos unix
+                #[cfg(target_os = "linux")]
+                #[cfg(target_os = "android")]
+                #[cfg(target_os = "freebsd")]
+                unsafe fn opendir(dirname: *c_char) -> *DIR;
+                #[cfg(target_os = "linux")]
+                #[cfg(target_os = "android")]
+                #[cfg(target_os = "freebsd")]
+                unsafe fn readdir(dirp: *DIR) -> *dirent_t;
+                // on OSX (particularly when running with a
+                // 64bit kernel), we have an issue where there
+                // are separate bindings for opendir and readdir,
+                // which we have to explicitly link, as below.
+                #[cfg(target_os = "macos")]
+                #[link_name = "opendir$INODE64"]
+                unsafe fn opendir(dirname: *c_char) -> *DIR;
+                #[cfg(target_os = "macos")]
+                #[link_name = "readdir$INODE64"]
+                unsafe fn readdir(dirp: *DIR) -> *dirent_t;
+
                 unsafe fn closedir(dirp: *DIR) -> c_int;
                 unsafe fn rewinddir(dirp: *DIR);
                 unsafe fn seekdir(dirp: *DIR, loc: c_long);