---

yaml
---
r: 107711
b: refs/heads/dist-snap
c: f572379
h: refs/heads/master
i:
  107709: 0ddc22b
  107707: 46670b4
  107703: f0a5338
  107695: 9e71904
  107679: e1917b4
  107647: 5eca07d
v: v3

Author: xales

[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: 1fdd23166d4b0d7791111b8067fec38d711c79c5
+refs/heads/dist-snap: f5723791e910381cebcbdde84575450898074795
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitignore

@@ -75,12 +75,10 @@ src/.DS_Store
 /doc/latex
 /doc/std
 /doc/extra
-/doc/flate
 /doc/green
 /doc/native
 /doc/rustc
 /doc/syntax
-/doc/rustdoc
 /doc/rustuv
 /doc/rustpkg
 /nd/

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

@@ -176,7 +176,7 @@ implemented in user-space.
 The primary concern of an M:N runtime is that a Rust task cannot block itself in
 a syscall. If this happens, then the entire OS thread is frozen and unavailable
 for running more Rust tasks, making this a (M-1):N runtime (and you can see how
-this can reach 0/deadlock. By using asynchronous I/O under the hood (all I/O
+this can reach 0/deadlock). By using asynchronous I/O under the hood (all I/O
 still looks synchronous in terms of code), OS threads are never blocked until
 the appropriate time comes.
 

branches/dist-snap/mk/tests.mk

@@ -344,8 +344,7 @@ ifeq ($(NO_REBUILD),)
 STDTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(SREQ$(1)_T_$(2)_H_$(3)) \
                             $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.extra \
                             $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustuv \
-                            $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.green \
-                            $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.native
+                            $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.green
 else
 STDTESTDEP_$(1)_$(2)_$(3)_$(4) =
 endif

branches/dist-snap/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

@@ -87,6 +87,7 @@
 		<keyword>f64</keyword>
 		<keyword>char</keyword>
 		<keyword>str</keyword>
+		<keyword>Either</keyword>
 		<keyword>Option</keyword>
 		<keyword>Result</keyword>
     </context>
@@ -133,6 +134,8 @@
 		<keyword>false</keyword>
 		<keyword>Some</keyword>
 		<keyword>None</keyword>
+		<keyword>Left</keyword>
+		<keyword>Right</keyword>
 		<keyword>Ok</keyword>
 		<keyword>Err</keyword>
 		<keyword>Success</keyword>

branches/dist-snap/src/etc/generate-deriving-span-tests.py

@@ -86,6 +86,7 @@
 		<item> float </item>
 		<item> char </item>
 		<item> str </item>
+		<item> Either </item>
 		<item> Option </item>
 		<item> Result </item>
 		<item> Self </item>
@@ -130,6 +131,8 @@
 		<item> false </item>
 		<item> Some </item>
 		<item> None </item>
+		<item> Left </item>
+		<item> Right </item>
 		<item> Ok </item>
 		<item> Err </item>
 		<item> Success </item>

branches/dist-snap/src/etc/kate/rust.xml

@@ -46,6 +46,8 @@ syn keyword   rustType        f64 i8 i16 i32 i64 str Self
 " to make it easy to update.
 
 " Core operators {{{3
+syn keyword   rustEnum        Either
+syn keyword   rustEnumVariant Left Right
 syn keyword   rustTrait       Sized
 syn keyword   rustTrait       Freeze Send
 syn keyword   rustTrait       Add Sub Mul Div Rem Neg Not
@@ -111,6 +113,7 @@ syn keyword   rustSelf        self
 syn keyword   rustBoolean     true false
 
 syn keyword   rustConstant    Some None       " option
+syn keyword   rustConstant    Left Right      " either
 syn keyword   rustConstant    Ok Err          " result
 syn keyword   rustConstant    Less Equal Greater " Ordering
 

branches/dist-snap/src/etc/vim/syntax/rust.vim

@@ -47,17 +47,13 @@ struct Node<T> {
 }
 
 /// Double-ended DList iterator
+#[deriving(Clone)]
 pub struct Items<'a, T> {
     priv head: &'a Link<T>,
     priv tail: Rawlink<Node<T>>,
     priv nelem: uint,
 }
 
-// FIXME #11820: the &'a Option<> of the Link stops clone working.
-impl<'a, T> Clone for Items<'a, T> {
-    fn clone(&self) -> Items<'a, T> { *self }
-}
-
 /// Double-ended mutable DList iterator
 pub struct MutItems<'a, T> {
     priv list: &'a mut DList<T>,

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

@@ -895,7 +895,7 @@ pub fn run_test(force_ignore: bool,
             return;
         }
         StaticBenchFn(benchfn) => {
-            let bs = ::test::bench::benchmark(|harness| benchfn(harness));
+            let bs = ::test::bench::benchmark(benchfn);
             monitor_ch.send((desc, TrBench(bs)));
             return;
         }

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

@@ -42,10 +42,11 @@ pub static general_code_alignment: uint = 16u;
 
 pub static tydesc_field_size: uint = 0u;
 pub static tydesc_field_align: uint = 1u;
-pub static tydesc_field_drop_glue: uint = 2u;
-pub static tydesc_field_visit_glue: uint = 3u;
-pub static tydesc_field_name_offset: uint = 4u;
-pub static n_tydesc_fields: uint = 5u;
+pub static tydesc_field_take_glue: uint = 2u;
+pub static tydesc_field_drop_glue: uint = 3u;
+pub static tydesc_field_visit_glue: uint = 4u;
+pub static tydesc_field_name_offset: uint = 5u;
+pub static n_tydesc_fields: uint = 6u;
 
 // The two halves of a closure: code and environment.
 pub static fn_field_code: uint = 0u;

branches/dist-snap/src/librustc/back/abi.rs

@@ -897,56 +897,42 @@ pub fn build_session_options(binary: ~str,
     return sopts;
 }
 
-pub fn build_session(sopts: @session::Options,
-                     local_crate_source_file: Option<Path>,
-                     demitter: @diagnostic::Emitter)
+pub fn build_session(sopts: @session::Options, demitter: @diagnostic::Emitter)
                      -> Session {
     let codemap = @codemap::CodeMap::new();
     let diagnostic_handler =
         diagnostic::mk_handler(Some(demitter));
     let span_diagnostic_handler =
         diagnostic::mk_span_handler(diagnostic_handler, codemap);
-
-    build_session_(sopts, local_crate_source_file, codemap, demitter, span_diagnostic_handler)
+    build_session_(sopts, codemap, demitter, span_diagnostic_handler)
 }
 
 pub fn build_session_(sopts: @session::Options,
-                      local_crate_source_file: Option<Path>,
-                      codemap: @codemap::CodeMap,
+                      cm: @codemap::CodeMap,
                       demitter: @diagnostic::Emitter,
                       span_diagnostic_handler: @diagnostic::SpanHandler)
                       -> Session {
     let target_cfg = build_target_config(sopts, demitter);
-    let p_s = parse::new_parse_sess_special_handler(span_diagnostic_handler, codemap);
+    let p_s = parse::new_parse_sess_special_handler(span_diagnostic_handler,
+                                                    cm);
     let cstore = @CStore::new(token::get_ident_interner());
     let filesearch = @filesearch::FileSearch::new(
         &sopts.maybe_sysroot,
         sopts.target_triple,
         sopts.addl_lib_search_paths);
-
-    // Make the path absolute, if necessary
-    let local_crate_source_file = local_crate_source_file.map(|path|
-        if path.is_absolute() {
-            path.clone()
-        } else {
-            os::getcwd().join(path.clone())
-        }
-    );
-
     @Session_ {
         targ_cfg: target_cfg,
         opts: sopts,
         cstore: cstore,
         parse_sess: p_s,
-        codemap: codemap,
+        codemap: cm,
         // For a library crate, this is always none
         entry_fn: RefCell::new(None),
         entry_type: Cell::new(None),
         macro_registrar_fn: RefCell::new(None),
         span_diagnostic: span_diagnostic_handler,
         filesearch: filesearch,
         building_library: Cell::new(false),
-        local_crate_source_file: local_crate_source_file,
         working_dir: os::getcwd(),
         lints: RefCell::new(HashMap::new()),
         node_id: Cell::new(1),
@@ -1178,8 +1164,13 @@ mod test {
               Ok(m) => m,
               Err(f) => fail!("test_switch_implies_cfg_test: {}", f.to_err_msg())
             };
-        let sessopts = build_session_options(~"rustc", matches, @diagnostic::DefaultEmitter);
-        let sess = build_session(sessopts, None, @diagnostic::DefaultEmitter);
+        let sessopts = build_session_options(
+            ~"rustc",
+            matches,
+            @diagnostic::DefaultEmitter as @diagnostic::Emitter);
+        let sess = build_session(sessopts,
+                                 @diagnostic::DefaultEmitter as
+                                    @diagnostic::Emitter);
         let cfg = build_configuration(sess);
         assert!((attr::contains_name(cfg, "test")));
     }
@@ -1196,8 +1187,13 @@ mod test {
                        f.to_err_msg());
               }
             };
-        let sessopts = build_session_options(~"rustc", matches, @diagnostic::DefaultEmitter);
-        let sess = build_session(sessopts, None, @diagnostic::DefaultEmitter);
+        let sessopts = build_session_options(
+            ~"rustc",
+            matches,
+            @diagnostic::DefaultEmitter as @diagnostic::Emitter);
+        let sess = build_session(sessopts,
+                                 @diagnostic::DefaultEmitter as
+                                    @diagnostic::Emitter);
         let cfg = build_configuration(sess);
         let mut test_items = cfg.iter().filter(|m| "test" == m.name());
         assert!(test_items.next().is_some());

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

@@ -211,9 +211,6 @@ pub struct Session_ {
     macro_registrar_fn: RefCell<Option<ast::DefId>>,
     filesearch: @filesearch::FileSearch,
     building_library: Cell<bool>,
-    // The name of the root source file of the crate, in the local file system. The path is always
-    // expected to be absolute. `None` means that there is no source file.
-    local_crate_source_file: Option<Path>,
     working_dir: Path,
     lints: RefCell<HashMap<ast::NodeId,
                            ~[(lint::Lint, codemap::Span, ~str)]>>,