---

yaml
---
r: 107675
b: refs/heads/dist-snap
c: cc61fc0
h: refs/heads/master
i:
  107673: 8dba28d
  107671: 70b76e5
v: v3

Author: salemtalha

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 6743c650c1649dcbb38d17fb029ed738e79ef0ae
+refs/heads/dist-snap: cc61fc09945aeec6fc71a07e91b8610fa71f6425
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/Makefile.in

@@ -636,7 +636,7 @@ CFG_INFO := $(info cfg: *** compiler is in snapshot transition ***)
 CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
 CFG_INFO := $(info cfg:)
 
-#XXX This is surely busted
+#FIXME This is surely busted
 all: $(SREQ1$(CFG_BUILD)) $(GENERATED) docs
 
 else

branches/dist-snap/doc/guide-container.md

@@ -90,7 +90,7 @@ Reaching the end of the iterator is signalled by returning `None` instead of
 # fn main() {}
 /// A stream of N zeroes
 struct ZeroStream {
-    remaining: uint
+    priv remaining: uint
 }
 
 impl ZeroStream {
@@ -305,7 +305,7 @@ The `ZeroStream` from earlier can provide an exact lower and upper bound:
 # fn main() {}
 /// A stream of N zeroes
 struct ZeroStream {
-    remaining: uint
+    priv remaining: uint
 }
 
 impl ZeroStream {

branches/dist-snap/doc/tutorial.md

@@ -2895,7 +2895,7 @@ and only if that results in no match look at items you brought in
 scope with corresponding `use` statements.
 
 ~~~ {.ignore}
-# // XXX: Allow unused import in doc test
+# // FIXME: Allow unused import in doc test
 use farm::cow;
 // ...
 # mod farm { pub fn cow() { println!("Hidden ninja cow is hidden.") } }

branches/dist-snap/mk/platform.mk

@@ -596,7 +596,7 @@ define CFG_MAKE_TOOLCHAIN
   else
 
   # For the ARM and MIPS crosses, use the toolchain assembler
-  # XXX: We should be able to use the LLVM assembler
+  # FIXME: We should be able to use the LLVM assembler
   CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
 		    $$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
 

branches/dist-snap/src/libextra/arc.rs

@@ -148,7 +148,7 @@ impl<T:Freeze + Send> Clone for Arc<T> {
  ****************************************************************************/
 
 #[doc(hidden)]
-struct MutexArcInner<T> { lock: Mutex, failed: bool, data: T }
+struct MutexArcInner<T> { priv lock: Mutex, priv failed: bool, priv data: T }
 
 /// An Arc with mutable data protected by a blocking mutex.
 #[no_freeze]
@@ -312,7 +312,7 @@ impl PoisonOnFail {
  ****************************************************************************/
 
 #[doc(hidden)]
-struct RWArcInner<T> { lock: RWLock, failed: bool, data: T }
+struct RWArcInner<T> { priv lock: RWLock, priv failed: bool, priv data: T }
 /**
  * A dual-mode Arc protected by a reader-writer lock. The data can be accessed
  * mutably or immutably, and immutably-accessing tasks may run concurrently.

branches/dist-snap/src/libextra/arena.rs

@@ -276,7 +276,7 @@ impl Arena {
     #[inline]
     pub fn alloc<'a, T>(&'a self, op: || -> T) -> &'a T {
         unsafe {
-            // XXX: Borrow check
+            // FIXME: Borrow check
             let this = transmute_mut(self);
             if intrinsics::needs_drop::<T>() {
                 this.alloc_nonpod(op)

branches/dist-snap/src/libextra/dlist.rs

@@ -38,12 +38,12 @@ pub struct DList<T> {
 }
 
 type Link<T> = Option<~Node<T>>;
-struct Rawlink<T> { p: *mut T }
+struct Rawlink<T> { priv p: *mut T }
 
 struct Node<T> {
-    next: Link<T>,
-    prev: Rawlink<Node<T>>,
-    value: T,
+    priv next: Link<T>,
+    priv prev: Rawlink<Node<T>>,
+    priv value: T,
 }
 
 /// Double-ended DList iterator

branches/dist-snap/src/libextra/ebml.rs

@@ -630,7 +630,7 @@ pub mod writer {
 
     // FIXME (#2741): Provide a function to write the standard ebml header.
     impl<'a> Encoder<'a> {
-        /// XXX(pcwalton): Workaround for badness in trans. DO NOT USE ME.
+        /// FIXME(pcwalton): Workaround for badness in trans. DO NOT USE ME.
         pub unsafe fn unsafe_clone(&self) -> Encoder<'a> {
             Encoder {
                 writer: cast::transmute_copy(&self.writer),

branches/dist-snap/src/libextra/glob.rs

@@ -93,7 +93,7 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Paths {
     let pat_root = Path::new(pattern).root_path();
     if pat_root.is_some() {
         if check_windows_verbatim(pat_root.get_ref()) {
-            // XXX: How do we want to handle verbatim paths? I'm inclined to return nothing,
+            // FIXME: How do we want to handle verbatim paths? I'm inclined to return nothing,
             // since we can't very well find all UNC shares with a 1-letter server name.
             return Paths { root: root, dir_patterns: ~[], options: options, todo: ~[] };
         }

branches/dist-snap/src/libextra/lru_cache.rs

@@ -43,13 +43,13 @@ use std::to_bytes::Cb;
 use std::ptr;
 use std::cast;
 
-struct KeyRef<K> { k: *K }
+struct KeyRef<K> { priv k: *K }
 
 struct LruEntry<K, V> {
-    key: Option<K>,
-    value: Option<V>,
-    next: *mut LruEntry<K, V>,
-    prev: *mut LruEntry<K, V>,
+    priv key: Option<K>,
+    priv value: Option<V>,
+    priv next: *mut LruEntry<K, V>,
+    priv prev: *mut LruEntry<K, V>,
 }
 
 /// An LRU Cache.

branches/dist-snap/src/libextra/sync.rs

@@ -709,8 +709,8 @@ pub struct Barrier {
 
 // The inner state of a double barrier
 struct BarrierState {
-    count: uint,
-    generation_id: uint,
+    priv count: uint,
+    priv generation_id: uint,
 }
 
 impl Barrier {

branches/dist-snap/src/libextra/url.rs

@@ -174,7 +174,7 @@ fn decode_inner(s: &str, full_url: bool) -> ~str {
             let mut bytes = [0, 0];
             match rdr.read(bytes) {
                 Some(2) => {}
-                _ => fail!() // XXX: malformed url?
+                _ => fail!() // FIXME: malformed url?
             }
             let ch = uint::parse_bytes(bytes, 16u).unwrap() as u8 as char;
 
@@ -308,7 +308,7 @@ pub fn decode_form_urlencoded(s: &[u8]) -> HashMap<~str, ~[~str]> {
                         let mut bytes = [0, 0];
                         match rdr.read(bytes) {
                             Some(2) => {}
-                            _ => fail!() // XXX: malformed?
+                            _ => fail!() // FIXME: malformed?
                         }
                         uint::parse_bytes(bytes, 16u).unwrap() as u8 as char
                     }

branches/dist-snap/src/libextra/workcache.rs

@@ -413,7 +413,7 @@ impl<'a> Prep<'a> {
                 let (port, chan) = Chan::new();
                 let blk = bo.take_unwrap();
 
-                // XXX: What happens if the task fails?
+                // FIXME: What happens if the task fails?
                 do spawn {
                     let mut exe = Exec {
                         discovered_inputs: WorkMap::new(),

branches/dist-snap/src/libgreen/basic.rs

@@ -139,7 +139,7 @@ impl EventLoop for BasicLoop {
         self.work.push(f);
     }
 
-    // XXX: Seems like a really weird requirement to have an event loop provide.
+    // FIXME: Seems like a really weird requirement to have an event loop provide.
     fn pausable_idle_callback(&mut self, cb: ~Callback) -> ~PausableIdleCallback {
         let callback = ~BasicPausable::new(self, cb);
         rtassert!(self.idle.is_none());

branches/dist-snap/src/libgreen/macros.rs

@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// XXX: this file probably shouldn't exist
+// FIXME: this file probably shouldn't exist
 
 #[macro_escape];
 
 use std::fmt;
 
 // Indicates whether we should perform expensive sanity checks, including rtassert!
-// XXX: Once the runtime matures remove the `true` below to turn off rtassert, etc.
+// FIXME: Once the runtime matures remove the `true` below to turn off rtassert, etc.
 pub static ENFORCE_SANITY: bool = true || !cfg!(rtopt) || cfg!(rtdebug) || cfg!(rtassert);
 
 macro_rules! rterrln (

branches/dist-snap/src/libgreen/sched.rs

@@ -32,7 +32,7 @@ use task::{TypeSched, GreenTask, HomeSched, AnySched};
 /// struct. The scheduler struct acts like a baton, all scheduling
 /// actions are transfers of the baton.
 ///
-/// XXX: This creates too many callbacks to run_sched_once, resulting
+/// FIXME: This creates too many callbacks to run_sched_once, resulting
 /// in too much allocation and too many events.
 pub struct Scheduler {
     /// ID number of the pool that this scheduler is a member of. When
@@ -171,7 +171,7 @@ impl Scheduler {
         return sched;
     }
 
-    // XXX: This may eventually need to be refactored so that
+    // FIXME: This may eventually need to be refactored so that
     // the scheduler itself doesn't have to call event_loop.run.
     // That will be important for embedding the runtime into external
     // event loops.
@@ -898,7 +898,7 @@ impl CleanupJob {
     }
 }
 
-// XXX: Some hacks to put a || closure in Scheduler without borrowck
+// FIXME: Some hacks to put a || closure in Scheduler without borrowck
 // complaining
 type UnsafeTaskReceiver = raw::Closure;
 trait ClosureConverter {

branches/dist-snap/src/libgreen/stack.rs

@@ -61,7 +61,7 @@ impl Stack {
             valgrind_id: 0
         };
 
-        // XXX: Using the FFI to call a C macro. Slow
+        // FIXME: Using the FFI to call a C macro. Slow
         stk.valgrind_id = unsafe {
             rust_valgrind_stack_register(stk.start(), stk.end())
         };
@@ -117,7 +117,7 @@ fn protect_last_page(stack: &MemoryMap) -> bool {
 impl Drop for Stack {
     fn drop(&mut self) {
         unsafe {
-            // XXX: Using the FFI to call a C macro. Slow
+            // FIXME: Using the FFI to call a C macro. Slow
             rust_valgrind_stack_deregister(self.valgrind_id);
         }
     }

branches/dist-snap/src/libnative/io/file.rs

@@ -674,7 +674,7 @@ pub fn chown(p: &CString, uid: int, gid: int) -> IoResult<()> {
 pub fn readlink(p: &CString) -> IoResult<Path> {
     return os_readlink(p);
 
-    // XXX: I have a feeling that this reads intermediate symlinks as well.
+    // FIXME: I have a feeling that this reads intermediate symlinks as well.
     #[cfg(windows)]
     fn os_readlink(p: &CString) -> IoResult<Path> {
         let handle = unsafe {
@@ -709,7 +709,7 @@ pub fn readlink(p: &CString) -> IoResult<Path> {
         let p = p.with_ref(|p| p);
         let mut len = unsafe { libc::pathconf(p, libc::_PC_NAME_MAX) };
         if len == -1 {
-            len = 1024; // XXX: read PATH_MAX from C ffi?
+            len = 1024; // FIXME: read PATH_MAX from C ffi?
         }
         let mut buf = vec::with_capacity::<u8>(len as uint);
         match retry(|| unsafe {
@@ -877,7 +877,7 @@ pub fn stat(p: &CString) -> IoResult<io::FileStat> {
 pub fn lstat(p: &CString) -> IoResult<io::FileStat> {
     return os_lstat(p);
 
-    // XXX: windows implementation is missing
+    // FIXME: windows implementation is missing
     #[cfg(windows)]
     fn os_lstat(_p: &CString) -> IoResult<io::FileStat> {
         Err(super::unimpl())

branches/dist-snap/src/libnative/io/mod.rs

@@ -97,7 +97,7 @@ fn translate_error(errno: i32, detail: bool) -> IoError {
 
     #[cfg(not(windows))]
     fn get_err(errno: i32) -> (io::IoErrorKind, &'static str) {
-        // XXX: this should probably be a bit more descriptive...
+        // FIXME: this should probably be a bit more descriptive...
         match errno {
             libc::EOF => (io::EndOfFile, "end of file"),
             libc::ECONNREFUSED => (io::ConnectionRefused, "connection refused"),

branches/dist-snap/src/libnative/io/timer_timerfd.rs

@@ -104,7 +104,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
                 let mut bits = [0, ..8];
                 // drain the timerfd of how many times its fired
                 //
-                // XXX: should this perform a send() this number of
+                // FIXME: should this perform a send() this number of
                 //      times?
                 FileDesc::new(fd, false).inner_read(bits);
                 let remove = {

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

@@ -330,7 +330,7 @@ fn parse_crate_attrs(sess: session::Session,
 /// The diagnostic emitter yielded to the procedure should be used for reporting
 /// errors of the compiler.
 pub fn monitor(f: proc(@diagnostic::Emitter)) {
-    // XXX: This is a hack for newsched since it doesn't support split stacks.
+    // FIXME: This is a hack for newsched since it doesn't support split stacks.
     // rustc needs a lot of stack! When optimizations are disabled, it needs
     // even *more* stack than usual as well.
     #[cfg(rtopt)]
@@ -341,7 +341,7 @@ pub fn monitor(f: proc(@diagnostic::Emitter)) {
     let mut task_builder = task::task();
     task_builder.name("rustc");
 
-    // XXX: Hacks on hacks. If the env is trying to override the stack size
+    // FIXME: Hacks on hacks. If the env is trying to override the stack size
     // then *don't* set it explicitly.
     if os::getenv("RUST_MIN_STACK").is_none() {
         task_builder.opts.stack_size = Some(STACK_SIZE);

branches/dist-snap/src/librustc/metadata/encoder.rs

@@ -1275,7 +1275,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
                     // If this is a static method, we've already encoded
                     // this.
                     if method_ty.explicit_self != SelfStatic {
-                        // XXX: I feel like there is something funny going on.
+                        // FIXME: I feel like there is something funny going on.
                         let tpt = ty::lookup_item_type(tcx, method_def_id);
                         encode_bounds_and_type(ebml_w, ecx, &tpt);
                     }

branches/dist-snap/src/librustc/metadata/loader.rs

@@ -187,7 +187,7 @@ impl Context {
         for lib in libs.mut_iter() {
             match lib.dylib {
                 Some(ref p) if p.filename_str() == Some(file.as_slice()) => {
-                    assert!(lib.rlib.is_none()); // XXX: legit compiler error
+                    assert!(lib.rlib.is_none()); // FIXME: legit compiler error
                     lib.rlib = Some(path.clone());
                     return true;
                 }
@@ -207,7 +207,7 @@ impl Context {
         for lib in libs.mut_iter() {
             match lib.rlib {
                 Some(ref p) if p.filename_str() == Some(file.as_slice()) => {
-                    assert!(lib.dylib.is_none()); // XXX: legit compiler error
+                    assert!(lib.dylib.is_none()); // FIXME: legit compiler error
                     lib.dylib = Some(path.clone());
                     return true;
                 }

branches/dist-snap/src/librustc/middle/astencode.rs

@@ -913,7 +913,7 @@ impl<'a,'b> ast_util::IdVisitingOperation for
         // it is mutable. But I believe it's harmless since we generate
         // balanced EBML.
         //
-        // XXX(pcwalton): Don't copy this way.
+        // FIXME(pcwalton): Don't copy this way.
         let mut new_ebml_w = unsafe {
             self.new_ebml_w.unsafe_clone()
         };

branches/dist-snap/src/librustc/middle/borrowck/gather_loans/mod.rs

@@ -416,7 +416,7 @@ impl<'a> GatherLoanCtxt<'a> {
             }
 
             ty::AutoObject(..) => {
-                // XXX: Handle @Trait to &Trait casts here?
+                // FIXME: Handle @Trait to &Trait casts here?
             }
         }
     }

branches/dist-snap/src/librustc/middle/borrowck/mod.rs

@@ -50,7 +50,7 @@ pub mod move_data;
 
 pub struct LoanDataFlowOperator;
 
-/// XXX(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
+/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
 /// yet on unit structs.
 impl Clone for LoanDataFlowOperator {
     fn clone(&self) -> LoanDataFlowOperator {

branches/dist-snap/src/librustc/middle/borrowck/move_data.rs

@@ -148,7 +148,7 @@ pub struct Assignment {
 
 pub struct MoveDataFlowOperator;
 
-/// XXX(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
+/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
 /// yet on unit structs.
 impl Clone for MoveDataFlowOperator {
     fn clone(&self) -> MoveDataFlowOperator {
@@ -160,7 +160,7 @@ pub type MoveDataFlow = DataFlowContext<MoveDataFlowOperator>;
 
 pub struct AssignDataFlowOperator;
 
-/// XXX(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
+/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
 /// yet on unit structs.
 impl Clone for AssignDataFlowOperator {
     fn clone(&self) -> AssignDataFlowOperator {