---

yaml
---
r: 69201
b: refs/heads/auto
c: fc05819
h: refs/heads/master
i:
  69199: 3752502
v: v3

Author: thestinger

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: a74d92e8ab61863876d2b5b6256b403efbb55492
+refs/heads/auto: fc058191818e4440d36e5ed4ef61bc0a9711be11
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/etc/extract-tests.py

@@ -60,9 +60,6 @@
             if not re.search(r"\bextern mod extra\b", block):
                 block = "extern mod extra;\n" + block
             block = """#[ forbid(ctypes) ];
-#[ forbid(deprecated_pattern) ];
-#[ forbid(implicit_copies) ];
-#[ forbid(non_implicitly_copyable_typarams) ];
 #[ forbid(path_statement) ];
 #[ forbid(type_limits) ];
 #[ forbid(unrecognized_lint) ];

branches/auto/src/etc/zsh/_rust

@@ -33,12 +33,9 @@ _rustc_opts_switches=(
 )
 _rustc_opts_lint=(
     'path-statement[path statements with no effect]'
-    'deprecated-pattern[warn about deprecated uses of pattern bindings]'
-    'non-implicitly-copyable-typarams[passing non implicitly copyable types as copy type params]'
     'missing-trait-doc[detects missing documentation for traits]'
     'missing-struct-doc[detects missing documentation for structs]'
     'ctypes[proper use of core::libc types in foreign modules]'
-    'implicit-copies[implicit copies of non implicitly copyable data]'
     "unused-mut[detect mut variables which don't need to be mutable]"
     'unused-imports[imports that are never used]'
     'heap-memory[use of any (~ type or @ type) heap memory]'

branches/auto/src/librustc/middle/lint.rs

@@ -75,9 +75,7 @@ pub enum lint {
     unnecessary_qualification,
     while_true,
     path_statement,
-    implicit_copies,
     unrecognized_lint,
-    deprecated_pattern,
     non_camel_case_types,
     non_uppercase_statics,
     type_limits,
@@ -182,20 +180,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
         default: warn
      }),
 
-    ("implicit_copies",
-     LintSpec {
-        lint: implicit_copies,
-        desc: "implicit copies of non implicitly copyable data",
-        default: warn
-     }),
-
-    ("deprecated_pattern",
-     LintSpec {
-        lint: deprecated_pattern,
-        desc: "warn about deprecated uses of pattern bindings",
-        default: allow
-     }),
-
     ("non_camel_case_types",
      LintSpec {
         lint: non_camel_case_types,

branches/auto/src/librustc/rustc.rs

@@ -17,8 +17,6 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[deny(deprecated_pattern)];
-
 extern mod extra;
 extern mod syntax;
 

branches/auto/src/libstd/result.rs

@@ -396,7 +396,6 @@ pub fn unwrap_err<T, U>(res: Result<T, U>) -> U {
 }
 
 #[cfg(test)]
-#[allow(non_implicitly_copyable_typarams)]
 mod tests {
     use result::{Err, Ok, Result, chain, get, get_err};
     use result;

branches/auto/src/libstd/tuple.rs

@@ -384,7 +384,6 @@ mod tests {
     }
 
     #[test]
-    #[allow(non_implicitly_copyable_typarams)]
     fn test_tuple() {
         assert_eq!((948, 4039.48).first(), 948);
         assert_eq!((34.5, ~"foo").second(), ~"foo");

branches/auto/src/libsyntax/parse/parser.rs

@@ -3996,50 +3996,37 @@ impl Parser {
         let prefix = prefix.dir_path();
         let mod_path_stack = &*self.mod_path_stack;
         let mod_path = Path(".").push_many(*mod_path_stack);
-        let dir_path = prefix.push_many(mod_path.components);
         let file_path = match ::attr::first_attr_value_str_by_name(
                 outer_attrs, "path") {
             Some(d) => {
                 let path = Path(d);
                 if !path.is_absolute {
-                    dir_path.push(d)
+                    mod_path.push(d)
                 } else {
                     path
                 }
             }
-            None => {
-                let mod_name = token::interner_get(id.name).to_owned();
-                let default_path_str = mod_name + ".rs";
-                let secondary_path_str = mod_name + "/mod.rs";
-                let default_path = dir_path.push(default_path_str);
-                let secondary_path = dir_path.push(secondary_path_str);
-                let default_exists = default_path.exists();
-                let secondary_exists = secondary_path.exists();
-                match (default_exists, secondary_exists) {
-                    (true, false) => default_path,
-                    (false, true) => secondary_path,
-                    (false, false) => {
-                        self.span_fatal(id_sp, fmt!("file not found for module `%s`", mod_name));
-                    }
-                    (true, true) => {
-                        self.span_fatal(id_sp,
-                                        fmt!("file for module `%s` found at both %s and %s",
-                                             mod_name, default_path_str, secondary_path_str));
-                    }
-                }
-            }
+            None => mod_path.push(token::interner_get(id.name) + ".rs") // default
         };
 
-        self.eval_src_mod_from_path(file_path,
+        self.eval_src_mod_from_path(prefix,
+                                    file_path,
                                     outer_attrs.to_owned(),
                                     id_sp)
     }
 
     fn eval_src_mod_from_path(&self,
+                              prefix: Path,
                               path: Path,
                               outer_attrs: ~[ast::Attribute],
                               id_sp: span) -> (ast::item_, ~[ast::Attribute]) {
-        let full_path = path.normalize();
+
+        let full_path = if path.is_absolute {
+            path
+        } else {
+            prefix.push_many(path.components)
+        };
+        let full_path = full_path.normalize();
 
         let maybe_i = do self.sess.included_mod_stack.iter().position |p| { *p == full_path };
         match maybe_i {

branches/auto/src/libsyntax/syntax.rs

@@ -20,8 +20,6 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[deny(deprecated_pattern)];
-
 extern mod extra;
 
 pub mod util {

branches/auto/src/test/run-pass/mod_dir_implicit_aux/mod.rs renamed to branches/auto/src/test/compile-fail/missingmod.rc

@@ -8,4 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-pub fn foo() -> int { 10 }
+// error-pattern:error opening
+
+mod doesnotexist;

branches/auto/src/test/compile-fail/mod_file_disambig.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-mod not_a_real_file; //~ ERROR file not found for module `not_a_real_file`
+mod not_a_real_file; //~ ERROR not_a_real_file.rs
 
 fn main() {
     assert_eq!(mod_file_aux::bar(), 10);

branches/auto/src/test/compile-fail/mod_file_disambig_aux.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(non_implicitly_copyable_typarams)];
-
 extern mod syntax;
 
 use syntax::ext::base::ExtCtxt;

branches/auto/src/test/compile-fail/mod_file_disambig_aux/mod.rs

@@ -12,8 +12,6 @@
 
 // xfail-test #6122
 
-#[forbid(deprecated_pattern)];
-
 extern mod extra;
 
 // These tests used to be separate files, but I wanted to refactor all

branches/auto/src/test/compile-fail/mod_file_not_exist.rs

@@ -8,10 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-// error on implicit copies to check fixed length vectors
-// are implicitly copyable
-#[deny(implicit_copies)]
 pub fn main() {
     let arr = [1,2,3];
     let arr2 = arr;

branches/auto/src/test/run-pass-fulldeps/quote-tokens.rs

@@ -21,7 +21,6 @@ fn C(x: uint) -> C {
 fn f<T>(_x: T) {
 }
 
-#[deny(non_implicitly_copyable_typarams)]
 pub fn main() {
     f(C(1u));
 }