---

yaml
---
r: 30334
b: refs/heads/incoming
c: fa2fb0f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: d12128f56fdf315913bd5c427b3322bed484f1b3
+refs/heads/incoming: fa2fb0f86831c7bdb1c874eb49074d11640d5cf9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/alt.rs

@@ -58,7 +58,8 @@ fn trans_opt(bcx: block, o: opt) -> opt_result {
             return single_result(rslt(bcx, *cell));
           }
           _ => {
-            return single_result(trans_temp_expr(bcx, l));
+            return single_result(
+                rslt(bcx, consts::const_expr(ccx, l)));
           }
         }
       }
@@ -635,14 +636,13 @@ fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
             }
           }
           lit(_) => {
+            test_val = Load(bcx, val);
             let pty = node_id_type(bcx, pat_id);
-            test_val = load_if_immediate(bcx, val, pty);
             kind = if ty::type_is_integral(pty) { switch }
                    else { compare };
           }
           range(_, _) => {
-            let pty = node_id_type(bcx, pat_id);
-            test_val = load_if_immediate(bcx, val, pty);
+            test_val = Load(bcx, val);
             kind = compare;
           }
         }

branches/incoming/src/rustdoc/astsrv.rs

@@ -7,19 +7,19 @@
      Rustdoc from its non-sendableness."
 )];
 
-import std::map::hashmap;
-import rustc::driver::session;
-import session::{basic_options, options};
-import session::session;
-import rustc::driver::driver;
-import syntax::diagnostic;
-import syntax::diagnostic::handler;
-import syntax::ast;
-import syntax::codemap;
-import syntax::ast_map;
-import rustc::back::link;
-import rustc::metadata::filesearch;
-import rustc::front;
+use std::map::hashmap;
+use rustc::driver::session;
+use session::{basic_options, options};
+use session::session;
+use rustc::driver::driver;
+use syntax::diagnostic;
+use syntax::diagnostic::handler;
+use syntax::ast;
+use syntax::codemap;
+use syntax::ast_map;
+use rustc::back::link;
+use rustc::metadata::filesearch;
+use rustc::front;
 
 export ctxt;
 export ctxt_handler;

branches/incoming/src/rustdoc/attr_parser.rs

@@ -5,9 +5,9 @@
      an AST's attributes."
 )];
 
-import syntax::ast;
-import syntax::attr;
-import core::tuple;
+use syntax::ast;
+use syntax::attr;
+use core::tuple;
 
 export crate_attrs;
 export parse_crate, parse_desc;

branches/incoming/src/rustdoc/attr_pass.rs

@@ -6,11 +6,11 @@
      of the natural-language documentation for a crate."
 )];
 
-import doc::item_utils;
-import extract::to_str;
-import syntax::ast;
-import syntax::ast_map;
-import std::map::hashmap;
+use doc::item_utils;
+use extract::to_str;
+use syntax::ast;
+use syntax::ast_map;
+use std::map::hashmap;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/config.rs

@@ -1,5 +1,5 @@
-import result::Result;
-import std::getopts;
+use result::Result;
+use std::getopts;
 
 export output_format;
 export output_style;

branches/incoming/src/rustdoc/desc_to_brief_pass.rs

@@ -5,7 +5,7 @@
  * is interpreted as the brief description.
  */
 
-import doc::item_utils;
+use doc::item_utils;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/extract.rs

@@ -1,7 +1,7 @@
 //! Converts the Rust AST to the rustdoc document model
 
-import syntax::ast;
-import doc::item_utils;
+use syntax::ast;
+use doc::item_utils;
 
 export from_srv, extract, to_str, interner;
 

branches/incoming/src/rustdoc/markdown_index_pass.rs

@@ -1,6 +1,6 @@
 //! Build indexes as appropriate for the markdown pass
 
-import doc::item_utils;
+use doc::item_utils;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/markdown_pass.rs

@@ -1,9 +1,9 @@
 //! Generate markdown from a document tree
 
-import doc::item_utils;
-import markdown_writer::writer;
-import markdown_writer::writer_utils;
-import markdown_writer::writer_factory;
+use doc::item_utils;
+use markdown_writer::writer;
+use markdown_writer::writer_utils;
+use markdown_writer::writer_factory;
 
 export mk_pass;
 export header_kind, header_name, header_text;

branches/incoming/src/rustdoc/markdown_writer.rs

@@ -1,5 +1,5 @@
-import doc::item_utils;
-import io::ReaderUtil;
+use doc::item_utils;
+use io::ReaderUtil;
 
 export writeinstr;
 export writer;

branches/incoming/src/rustdoc/page_pass.rs

@@ -5,8 +5,8 @@
  * individual modules, pages for the crate, indexes, etc.
  */
 
-import doc::{item_utils, page_utils};
-import syntax::ast;
+use doc::{item_utils, page_utils};
+use syntax::ast;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/parse.rs

@@ -1,12 +1,12 @@
 //! AST-parsing helpers
 
-import rustc::driver::driver;
-import driver::{file_input, str_input};
-import rustc::driver::session;
-import syntax::diagnostic;
-import syntax::ast;
-import syntax::codemap;
-import syntax::parse;
+use rustc::driver::driver;
+use driver::{file_input, str_input};
+use rustc::driver::session;
+use syntax::diagnostic;
+use syntax::ast;
+use syntax::codemap;
+use syntax::parse;
 
 export from_file, from_str, from_file_sess, from_str_sess;
 

branches/incoming/src/rustdoc/path_pass.rs

@@ -1,7 +1,7 @@
 //! Records the full path to items
 
-import doc::item_utils;
-import syntax::ast;
+use doc::item_utils;
+use syntax::ast;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/prune_hidden_pass.rs

@@ -1,7 +1,7 @@
 //! Prunes things with the #[doc(hidden)] attribute
 
-import doc::item_utils;
-import std::map::hashmap;
+use doc::item_utils;
+use std::map::hashmap;
 export mk_pass;
 
 fn mk_pass() -> pass {

branches/incoming/src/rustdoc/rustdoc.rs

@@ -1,7 +1,7 @@
 // Some utility interfaces
-import doc::item_utils;
-import doc::item;
-import doc::util;
+use doc::item_utils;
+use doc::item;
+use doc::util;
 
 /// A single operation on the document model
 type pass = {

branches/incoming/src/rustdoc/sectionalize_pass.rs

@@ -1,6 +1,6 @@
 //! Breaks rustdocs into sections according to their headers
 
-import doc::item_utils;
+use doc::item_utils;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/sort_item_name_pass.rs

@@ -1,6 +1,6 @@
 //! Sorts items by name
 
-import doc::item_utils;
+use doc::item_utils;
 export mk_pass;
 
 fn mk_pass() -> pass {

branches/incoming/src/rustdoc/sort_item_type_pass.rs

@@ -1,6 +1,6 @@
 //! Sorts items by type
 
-import doc::item_utils;
+use doc::item_utils;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/sort_pass.rs

@@ -1,7 +1,7 @@
 //! A general sorting pass
 
-import doc::item_utils;
-import std::sort;
+use doc::item_utils;
+use std::sort;
 
 export item_lteq, mk_pass;
 

branches/incoming/src/rustdoc/text_pass.rs

@@ -1,6 +1,6 @@
 //! Generic pass for performing an operation on all descriptions
 
-import doc::item_utils;
+use doc::item_utils;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/trim_pass.rs

@@ -5,7 +5,7 @@
  * is interpreted as the brief description.
  */
 
-import doc::item_utils;
+use doc::item_utils;
 
 export mk_pass;
 

branches/incoming/src/rustdoc/tystr_pass.rs

@@ -1,11 +1,11 @@
 //! Pulls type information out of the AST and attaches it to the document
 
-import doc::item_utils;
-import syntax::ast;
-import syntax::print::pprust;
-import syntax::ast_map;
-import std::map::hashmap;
-import extract::to_str;
+use doc::item_utils;
+use syntax::ast;
+use syntax::print::pprust;
+use syntax::ast_map;
+use std::map::hashmap;
+use extract::to_str;
 
 export mk_pass;