---

yaml
---
r: 62966
b: refs/heads/snap-stage3
c: e900dba
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 394ac1aae4d8b23b65a2165b2cf00c66936cd437
+refs/heads/snap-stage3: e900dba28a1ff1434e037c48da2e99948333a564
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/resolve.rs

@@ -4595,7 +4595,7 @@ impl Resolver {
         }
 
         let name = *path.idents.last();
-        let def = match self.resolve_definition_of_name_in_module(containing_module,
+        match self.resolve_definition_of_name_in_module(containing_module,
                                                         name,
                                                         namespace,
                                                         xray) {
@@ -4604,28 +4604,9 @@ impl Resolver {
                 return None;
             }
             ChildNameDefinition(def) | ImportNameDefinition(def) => {
-                def
+                return Some(def);
             }
-        };
-        match containing_module.kind {
-            TraitModuleKind | ImplModuleKind => {
-                match self.method_map.find(&name) {
-                    Some(s) => {
-                        match containing_module.def_id {
-                            Some(def_id) if s.contains(&def_id) => {
-                                debug!("containing module was a trait or impl \
-                                        and name was a method -> not resolved");
-                                return None;
-                            },
-                            _ => (),
-                        }
-                    },
-                    None => (),
-                }
-            },
-            _ => (),
-        };
-        return Some(def);
+        }
     }
 
     /// Invariant: This must be called only during main resolution, not during

branches/snap-stage3/src/libstd/pipes.rs

@@ -94,7 +94,7 @@ use option::{None, Option, Some};
 use unstable::finally::Finally;
 use unstable::intrinsics;
 use ptr;
-use ptr::Ptr;
+use ptr::RawPtr;
 use task;
 use vec;
 use vec::OwnedVector;

branches/snap-stage3/src/libstd/prelude.rs

@@ -43,7 +43,7 @@ pub use path::GenericPath;
 pub use path::Path;
 pub use path::PosixPath;
 pub use path::WindowsPath;
-pub use ptr::Ptr;
+pub use ptr::RawPtr;
 pub use ascii::{Ascii, AsciiCast, OwnedAsciiCast, AsciiStr};
 pub use str::{StrVector, StrSlice, OwnedStr, StrUtil};
 pub use from_str::{FromStr};

branches/snap-stage3/src/libstd/ptr.rs

@@ -296,15 +296,15 @@ pub unsafe fn array_each<T>(arr: **T, cb: &fn(*T)) {
 }
 
 #[allow(missing_doc)]
-pub trait Ptr<T> {
+pub trait RawPtr<T> {
     fn is_null(&const self) -> bool;
     fn is_not_null(&const self) -> bool;
     unsafe fn to_option(&const self) -> Option<&T>;
     fn offset(&self, count: uint) -> Self;
 }
 
 /// Extension methods for immutable pointers
-impl<T> Ptr<T> for *T {
+impl<T> RawPtr<T> for *T {
     /// Returns true if the pointer is equal to the null pointer.
     #[inline(always)]
     fn is_null(&const self) -> bool { is_null(*self) }
@@ -336,7 +336,7 @@ impl<T> Ptr<T> for *T {
 }
 
 /// Extension methods for mutable pointers
-impl<T> Ptr<T> for *mut T {
+impl<T> RawPtr<T> for *mut T {
     /// Returns true if the pointer is equal to the null pointer.
     #[inline(always)]
     fn is_null(&const self) -> bool { is_null(*self) }

branches/snap-stage3/src/libstd/rt/mod.rs

@@ -56,7 +56,7 @@ Several modules in `core` are clients of `rt`:
 
 #[doc(hidden)];
 
-use ptr::Ptr;
+use ptr::RawPtr;
 
 /// The global (exchange) heap.
 pub mod global_heap;

branches/snap-stage3/src/libstd/rt/stack.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use container::Container;
-use ptr::Ptr;
+use ptr::RawPtr;
 use vec;
 use ops::Drop;
 use libc::{c_uint, uintptr_t};

branches/snap-stage3/src/libstd/rt/uv/mod.rs

@@ -38,7 +38,7 @@ use container::Container;
 use option::*;
 use str::raw::from_c_str;
 use to_str::ToStr;
-use ptr::Ptr;
+use ptr::RawPtr;
 use libc;
 use vec;
 use ptr;

branches/snap-stage3/src/libstd/str.rs

@@ -30,7 +30,7 @@ use libc;
 use option::{None, Option, Some};
 use old_iter::{BaseIter, EqIter};
 use ptr;
-use ptr::Ptr;
+use ptr::RawPtr;
 use str;
 use to_str::ToStr;
 use uint;

branches/snap-stage3/src/libstd/vec.rs

@@ -26,7 +26,7 @@ use old_iter::CopyableIter;
 use option::{None, Option, Some};
 use ptr::to_unsafe_ptr;
 use ptr;
-use ptr::Ptr;
+use ptr::RawPtr;
 use sys;
 use uint;
 use unstable::intrinsics;