---

yaml
---
r: 156511
b: refs/heads/master
c: 7b02185
h: refs/heads/master
i:
  156509: 7e268d6
  156507: e463276
  156503: d682cff
  156495: 0d54a89
  156479: d094ada
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7d7e40983972d128c74eaea1f92be1adaf45d647
+refs/heads/master: 7b021859a4ea33bb0f5512649a5c9792648e9ad6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: d44ea720fa9dfe062ef06d0eb49a58d4e7e92344
 refs/heads/try: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75

trunk/mk/main.mk

@@ -157,13 +157,6 @@ RUSTFLAGS_STAGE1 += -C prefer-dynamic
 # by not emitting them.
 RUSTFLAGS_STAGE0 += -Z no-landing-pads
 
-# Go fast for stage0, and also for stage1/stage2 if optimization is off.
-RUSTFLAGS_STAGE0 += -C codegen-units=4
-ifdef CFG_DISABLE_OPTIMIZE
-	RUSTFLAGS_STAGE1 += -C codegen-units=4
-	RUSTFLAGS_STAGE2 += -C codegen-units=4
-endif
-
 # platform-specific auto-configuration
 include $(CFG_SRC_DIR)mk/platform.mk
 

trunk/mk/tests.mk

@@ -584,14 +584,13 @@ ifeq ($(CFG_LLDB),)
 CTEST_DISABLE_debuginfo-lldb = "no lldb found"
 endif
 
+# Completely disable LLDB tests for now
+CTEST_DISABLE_debuginfo-lldb = "LLDB tests are not enabled yet"
+
 ifeq ($(CFG_CLANG),)
 CTEST_DISABLE_codegen = "no clang found"
 endif
 
-ifneq ($(CFG_OSTYPE),apple-darwin)
-CTEST_DISABLE_debuginfo-lldb = "lldb tests are only run on darwin"
-endif
-
 ifeq ($(CFG_OSTYPE),apple-darwin)
 CTEST_DISABLE_debuginfo-gdb = "gdb on darwing needs root"
 endif
@@ -629,10 +628,6 @@ CTEST_RUSTC_FLAGS := $$(subst -O,,$$(CTEST_RUSTC_FLAGS))
 ifndef CFG_DISABLE_OPTIMIZE_TESTS
 CTEST_RUSTC_FLAGS += -O
 endif
-# Force codegen-units=1 for compiletest tests.  compiletest does its own
-# parallelization internally, so rustc's default codegen-units=2 will actually
-# slow things down.
-CTEST_RUSTC_FLAGS += -C codegen-units=1
 
 CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
 		--compile-lib-path $$(HLIB$(1)_H_$(3)) \

trunk/src/compiletest/compiletest.rs

@@ -25,7 +25,7 @@ use std::io::fs;
 use std::from_str::FromStr;
 use getopts::{optopt, optflag, reqopt};
 use common::Config;
-use common::{Pretty, DebugInfoGdb, Codegen};
+use common::{Pretty, DebugInfoGdb, DebugInfoLldb, Codegen};
 use util::logv;
 use regex::Regex;
 
@@ -235,6 +235,16 @@ pub fn run_tests(config: &Config) {
         os::setenv("RUST_TEST_TASKS","1");
     }
 
+    match config.mode {
+        DebugInfoLldb => {
+            // Some older versions of LLDB seem to have problems with multiple
+            // instances running in parallel, so only run one test task at a
+            // time.
+            os::setenv("RUST_TEST_TASKS", "1");
+        }
+        _ => { /* proceed */ }
+    }
+
     let opts = test_opts(config);
     let tests = make_tests(config);
     // sadly osx needs some file descriptor limits raised for running tests in

trunk/src/compiletest/runtest.rs

@@ -653,15 +653,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
     script_str.push_str("version\n");
 
     // Switch LLDB into "Rust mode"
-    let rust_src_root = find_rust_src_root(config)
-        .expect("Could not find Rust source root");
-    let rust_pp_module_rel_path = Path::new("./src/etc/lldb_rust_formatters.py");
-    let rust_pp_module_abs_path = rust_src_root.join(rust_pp_module_rel_path)
-                                               .as_str()
-                                               .unwrap()
-                                               .to_string();
-
-    script_str.push_str(format!("command script import {}\n", rust_pp_module_abs_path[])[]);
+    script_str.push_str("command script import ./src/etc/lldb_rust_formatters.py\n");
     script_str.push_str("type summary add --no-value ");
     script_str.push_str("--python-function lldb_rust_formatters.print_val ");
     script_str.push_str("-x \".*\" --category Rust\n");
@@ -691,27 +683,18 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
     let debugger_script = make_out_name(config, testfile, "debugger.script");
 
     // Let LLDB execute the script via lldb_batchmode.py
-    let debugger_run_result = run_lldb(config,
-                                       &exe_file,
-                                       &debugger_script,
-                                       &rust_src_root);
+    let debugger_run_result = run_lldb(config, &exe_file, &debugger_script);
 
     if !debugger_run_result.status.success() {
         fatal_proc_rec("Error while running LLDB", &debugger_run_result);
     }
 
     check_debugger_output(&debugger_run_result, check_lines.as_slice());
 
-    fn run_lldb(config: &Config,
-                test_executable: &Path,
-                debugger_script: &Path,
-                rust_src_root: &Path)
-                -> ProcRes {
+    fn run_lldb(config: &Config, test_executable: &Path, debugger_script: &Path) -> ProcRes {
         // Prepare the lldb_batchmode which executes the debugger script
-        let lldb_script_path = rust_src_root.join(Path::new("./src/etc/lldb_batchmode.py"));
-
         let mut cmd = Command::new("python");
-        cmd.arg(lldb_script_path)
+        cmd.arg("./src/etc/lldb_batchmode.py")
            .arg(test_executable)
            .arg(debugger_script)
            .env_set_all([("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);

trunk/src/doc/guide.md

@@ -4326,7 +4326,7 @@ The most common consumer is `collect()`. This code doesn't quite compile,
 but it shows the intention:
 
 ```{rust,ignore}
-let one_to_one_hundred = range(1i, 101i).collect();
+let one_to_one_hundred = range(0i, 100i).collect();
 ```
 
 As you can see, we call `collect()` on our iterator. `collect()` takes
@@ -4336,7 +4336,7 @@ type of things you want to collect, and so you need to let it know.
 Here's the version that does compile:
 
 ```{rust}
-let one_to_one_hundred = range(1i, 101i).collect::<Vec<int>>();
+let one_to_one_hundred = range(0i, 100i).collect::<Vec<int>>();
 ```
 
 If you remember, the `::<>` syntax allows us to give a type hint,

trunk/src/etc/lldb_batchmode.py

@@ -141,11 +141,6 @@ def listen():
 target_path = sys.argv[1]
 script_path = sys.argv[2]
 
-print("LLDB batch-mode script")
-print("----------------------")
-print("Debugger commands script is '%s'." % script_path)
-print("Target executable is '%s'." % target_path)
-print("Current working directory is '%s'" % os.getcwd())
 
 # Create a new debugger instance
 debugger = lldb.SBDebugger.Create()
@@ -156,12 +151,10 @@ def listen():
 
 # Create a target from a file and arch
 print("Creating a target for '%s'" % target_path)
-target_error = lldb.SBError()
-target = debugger.CreateTarget(target_path, None, None, True, target_error)
+target = debugger.CreateTargetWithFileAndArch(target_path, lldb.LLDB_ARCH_DEFAULT)
 
 if not target:
-  print("Could not create debugging target '" + target_path + "': " + str(target_error) +
-        ". Aborting.", file=sys.stderr)
+  print("Could not create debugging target '" + target_path + "'. Aborting.", file=sys.stderr)
   sys.exit(1)
 
 

trunk/src/librustc/driver/config.rs

@@ -780,20 +780,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
         early_warn("the --crate-file-name argument has been renamed to \
                     --print-file-name");
     }
-
-    let mut cg = build_codegen_options(matches);
-
-    if cg.codegen_units == 0 {
-        match opt_level {
-            // `-C lto` doesn't work with multiple codegen units.
-            _ if cg.lto => cg.codegen_units = 1,
-
-            No | Less => cg.codegen_units = 2,
-            Default | Aggressive => cg.codegen_units = 1,
-        }
-    }
-    let cg = cg;
-
+    let cg = build_codegen_options(matches);
 
     if !cg.remark.is_empty() && debuginfo == NoDebugInfo {
         early_warn("-C remark will not show source locations without --debuginfo");

trunk/src/librustc/middle/traits/coherence.rs

@@ -67,9 +67,9 @@ pub fn impl_is_local(tcx: &ty::ctxt,
         return true;
     }
 
-    // Otherwise, at least one of the input types must be local to the
-    // crate.
-    trait_ref.input_types().iter().any(|&t| ty_is_local(tcx, t))
+    // Otherwise, self type must be local to the crate.
+    let self_ty = ty::lookup_item_type(tcx, impl_def_id).ty;
+    return ty_is_local(tcx, self_ty);
 }
 
 pub fn ty_is_local(tcx: &ty::ctxt,

trunk/src/librustdoc/passes.rs

@@ -134,18 +134,7 @@ impl<'a> fold::DocFolder for Stripper<'a> {
             clean::StructItem(..) | clean::EnumItem(..) |
             clean::TraitItem(..) | clean::FunctionItem(..) |
             clean::VariantItem(..) | clean::MethodItem(..) |
-            clean::ForeignFunctionItem(..) | clean::ForeignStaticItem(..) => {
-                if ast_util::is_local(i.def_id) {
-                    if !self.exported_items.contains(&i.def_id.node) {
-                        return None;
-                    }
-                    // Traits are in exported_items even when they're totally private.
-                    if i.is_trait() && i.visibility != Some(ast::Public) {
-                        return None;
-                    }
-                }
-            }
-
+            clean::ForeignFunctionItem(..) | clean::ForeignStaticItem(..) |
             clean::ConstantItem(..) => {
                 if ast_util::is_local(i.def_id) &&
                    !self.exported_items.contains(&i.def_id.node) {

trunk/src/libsyntax/parse/mod.rs

@@ -721,7 +721,7 @@ pub fn integer_lit(s: &str, sd: &SpanHandler, sp: Span) -> ast::Lit_ {
 mod test {
     use super::*;
     use serialize::json;
-    use codemap::{Span, BytePos, Pos, Spanned, NO_EXPANSION};
+    use codemap::{Span, BytePos, Spanned, NO_EXPANSION};
     use owned_slice::OwnedSlice;
     use ast;
     use abi;
@@ -1121,46 +1121,6 @@ mod test {
                             span: sp(0,21)})));
     }
 
-    fn get_spans_of_pat_idents(src: &str) -> Vec<Span> {
-        let item = string_to_item(src.to_string()).unwrap();
-
-        struct PatIdentVisitor {
-            spans: Vec<Span>
-        }
-        impl<'v> ::visit::Visitor<'v> for PatIdentVisitor {
-            fn visit_pat(&mut self, p: &'v ast::Pat) {
-                match p.node {
-                    ast::PatIdent(_ , ref spannedident, _) => {
-                        self.spans.push(spannedident.span.clone());
-                    }
-                    _ => {
-                        ::visit::walk_pat(self, p);
-                    }
-                }
-            }
-        }
-        let mut v = PatIdentVisitor { spans: Vec::new() };
-        ::visit::walk_item(&mut v, &*item);
-        return v.spans;
-    }
-
-    #[test] fn span_of_self_arg_pat_idents_are_correct() {
-
-        let srcs = ["impl z { fn a (&self, &myarg: int) {} }",
-                    "impl z { fn a (&mut self, &myarg: int) {} }",
-                    "impl z { fn a (&'a self, &myarg: int) {} }",
-                    "impl z { fn a (self, &myarg: int) {} }",
-                    "impl z { fn a (self: Foo, &myarg: int) {} }",
-                    ];
-
-        for &src in srcs.iter() {
-            let spans = get_spans_of_pat_idents(src);
-            let Span{lo:lo,hi:hi,..} = spans[0];
-            assert!("self" == src.slice(lo.to_uint(), hi.to_uint()),
-                    "\"{}\" != \"self\". src=\"{}\"",
-                    src.slice(lo.to_uint(), hi.to_uint()), src)
-        }
-    }
 
     #[test] fn parse_exprs () {
         // just make sure that they parse....

trunk/src/libsyntax/parse/parser.rs

@@ -4165,16 +4165,10 @@ impl<'a> Parser<'a> {
         // A bit of complexity and lookahead is needed here in order to be
         // backwards compatible.
         let lo = self.span.lo;
-        let mut self_ident_lo = self.span.lo;
-        let mut self_ident_hi = self.span.hi;
-
         let mut mutbl_self = MutImmutable;
         let explicit_self = match self.token {
             token::BINOP(token::AND) => {
-                let eself = maybe_parse_borrowed_explicit_self(self);
-                self_ident_lo = self.last_span.lo;
-                self_ident_hi = self.last_span.hi;
-                eself
+                maybe_parse_borrowed_explicit_self(self)
             }
             token::TILDE => {
                 // We need to make sure it isn't a type
@@ -4246,7 +4240,7 @@ impl<'a> Parser<'a> {
             _ => SelfStatic,
         };
 
-        let explicit_self_sp = mk_sp(self_ident_lo, self_ident_hi);
+        let explicit_self_sp = mk_sp(lo, self.span.hi);
 
         // shared fall-through for the three cases below. borrowing prevents simply
         // writing this as a closure

trunk/src/test/auxiliary/coherence-orphan-lib.rs

@@ -10,7 +10,6 @@
 
 // ignore-windows: FIXME #13256
 // ignore-android: FIXME(#10381)
-// min-lldb-version: 310
 
 // compile-flags:-g
 // gdb-command:rbreak zzz

trunk/src/test/debuginfo/basic-types-globals-metadata.rs

@@ -16,7 +16,6 @@
 
 // ignore-windows: FIXME #13256
 // ignore-android: FIXME(#10381)
-// min-lldb-version: 310
 
 // compile-flags:-g
 // gdb-command:rbreak zzz

trunk/src/test/debuginfo/basic-types-globals.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // ignore-android: FIXME(#10381)
-// min-lldb-version: 310
 
 // compile-flags:-g
 // gdb-command:rbreak zzz

trunk/src/test/debuginfo/basic-types-metadata.rs

@@ -16,7 +16,6 @@
 
 // ignore-windows: FIXME #13256
 // ignore-android: FIXME(#10381)
-// min-lldb-version: 310
 
 // compile-flags:-g
 // gdb-command:rbreak zzz

trunk/src/test/debuginfo/basic-types-mut-globals.rs

@@ -15,7 +15,6 @@
 // its numerical value.
 
 // ignore-android: FIXME(#10381)
-// min-lldb-version: 310
 
 // compile-flags:-g
 

trunk/src/test/debuginfo/basic-types.rs

@@ -14,7 +14,6 @@
 // its numerical value.
 
 // compile-flags:-g
-// min-lldb-version: 310
 
 // === GDB TESTS ===================================================================================
 

trunk/src/test/debuginfo/borrowed-basic.rs

@@ -11,7 +11,6 @@
 // ignore-android: FIXME(#10381)
 
 // compile-flags:-g
-// min-lldb-version: 310
 
 // === GDB TESTS ===================================================================================
 

trunk/src/test/debuginfo/borrowed-c-style-enum.rs

@@ -10,7 +10,6 @@
 
 // ignore-tidy-linelength
 // ignore-android: FIXME(#10381)
-// min-lldb-version: 310
 
 // compile-flags:-g
 

trunk/src/test/debuginfo/borrowed-enum.rs

@@ -10,7 +10,6 @@
 
 // ignore-android: FIXME(#10381)
 // compile-flags:-g
-// min-lldb-version: 310
 
 // === GDB TESTS ===================================================================================