---

yaml
---
r: 139506
b: refs/heads/try2
c: 26fc76a
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: bd7eb7e0f906c83228f01c65ec669fb71f7a42df
+refs/heads/try2: 26fc76acb6bd86375cc1fef218b3f91708a8f699
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/metadata/creader.rs

@@ -18,6 +18,7 @@ use metadata::decoder;
 use metadata::filesearch::FileSearch;
 use metadata::loader;
 
+use core::either;
 use core::hashmap::linear::LinearMap;
 use core::vec;
 use syntax::attr;

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

@@ -18,6 +18,7 @@ use util::ppaux::{ty_to_str};
 use core::hashmap::linear::LinearMap;
 use core::char;
 use core::cmp;
+use core::either;
 use core::i8;
 use core::i16;
 use core::i32;

branches/try2/src/librustc/middle/moves.rs

@@ -718,8 +718,8 @@ pub impl VisitContext {
     }
 
     fn use_receiver(&self,
-                    _expr_id: node_id,
-                    _span: span,
+                    expr_id: node_id,
+                    span: span,
                     receiver_expr: @expr,
                     visitor: vt<VisitContext>)
     {

branches/try2/src/librustc/middle/resolve.rs

@@ -1358,7 +1358,7 @@ pub impl Resolver {
                                        item_id: def_id,
                                        +parent_privacy: Privacy,
                                        parent: ReducedGraphParent,
-                                       &&_visitor: vt<ReducedGraphParent>) {
+                                       &&visitor: vt<ReducedGraphParent>) {
         let ident = variant.node.name;
         let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
                                         variant.span);

branches/try2/src/librustc/middle/trans/consts.rs

@@ -11,7 +11,7 @@
 use core::prelude::*;
 
 use back::abi;
-use lib::llvm::{llvm, SetLinkage, PrivateLinkage,
+use lib::llvm::{llvm, SetLinkage, InternalLinkage, PrivateLinkage,
                 ValueRef, TypeRef, Bool, True, False};
 use metadata::csearch;
 use middle::const_eval;

branches/try2/src/librustc/middle/trans/foreign.rs

@@ -11,6 +11,7 @@
 use core::prelude::*;
 
 use back::{link, abi};
+use driver::session;
 use lib::llvm::{SequentiallyConsistent, Acquire, Release, Xchg};
 use lib::llvm::{TypeRef, ValueRef};
 use lib;

branches/try2/src/librustc/middle/typeck/check/mod.rs

@@ -110,6 +110,7 @@ use util::common::{block_query, indenter, loop_query};
 use util::ppaux::{bound_region_to_str, expr_repr, pat_repr};
 use util::ppaux;
 
+use core::either;
 use core::hashmap::linear::LinearMap;
 use core::ptr;
 use core::result::{Result, Ok, Err};
@@ -118,7 +119,7 @@ use core::str;
 use core::vec;
 use std::list::Nil;
 use syntax::abi::AbiSet;
-use syntax::ast::{provided, required};
+use syntax::ast::{provided, required, ty_i};
 use syntax::ast;
 use syntax::ast_map;
 use syntax::ast_util::local_def;
@@ -3020,7 +3021,7 @@ pub fn check_enum_variants(ccx: @mut CrateCtxt,
                            vs: &[ast::variant],
                            id: ast::node_id) {
     fn do_check(ccx: @mut CrateCtxt,
-                _sp: span,
+                sp: span,
                 vs: &[ast::variant],
                 id: ast::node_id,
                 disr_vals: &mut ~[int],
@@ -3302,7 +3303,7 @@ pub fn type_is_c_like_enum(fcx: @mut FnCtxt, sp: span, typ: ty::t) -> bool {
 
 pub fn ast_expr_vstore_to_vstore(fcx: @mut FnCtxt,
                                  e: @ast::expr,
-                                 _n: uint,
+                                 n: uint,
                                  v: ast::expr_vstore)
                               -> ty::vstore {
     match v {

branches/try2/src/librustc/middle/typeck/collect.rs

@@ -33,7 +33,7 @@ are represented as `ty_param()` instances.
 use core::prelude::*;
 
 use metadata::csearch;
-use middle::ty::InstantiatedTraitRef;
+use middle::ty::{InstantiatedTraitRef, arg};
 use middle::ty::{substs, ty_param_bounds_and_ty, ty_param_substs_and_ty};
 use middle::ty;
 use middle::typeck::astconv::{AstConv, ty_of_arg};
@@ -860,7 +860,7 @@ pub fn ty_of_item(ccx: &CrateCtxt, it: @ast::item)
         tcx.tcache.insert(local_def(it.id), tpt);
         return tpt;
       }
-      ast::item_fn(ref decl, purity, _, ref generics, _) => {
+      ast::item_fn(ref decl, purity, abi, ref generics, _) => {
         let bounds = ty_param_bounds(ccx, generics);
         let tofd = astconv::ty_of_bare_fn(ccx,
                                           &empty_rscope,

branches/try2/src/librustc/middle/typeck/infer/coercion.rs

@@ -66,19 +66,20 @@ we may want to adjust precisely when coercions occur.
 
 use core::prelude::*;
 
-use middle::ty::{AutoPtr, AutoBorrowVec, AutoBorrowFn};
-use middle::ty::{AutoDerefRef, AutoRef};
-use middle::ty::{vstore_slice, vstore_box, vstore_uniq};
+use middle::ty::{TyVar, AutoPtr, AutoBorrowVec, AutoBorrowFn};
+use middle::ty::{AutoAdjustment, AutoDerefRef, AutoRef};
+use middle::ty::{vstore_slice, vstore_box, vstore_uniq, vstore_fixed};
 use middle::ty::{mt};
 use middle::ty;
 use middle::typeck::infer::{CoerceResult, resolve_type};
 use middle::typeck::infer::combine::CombineFields;
 use middle::typeck::infer::sub::Sub;
 use middle::typeck::infer::to_str::InferStr;
 use middle::typeck::infer::resolve::try_resolve_tvar_shallow;
-use util::common::indenter;
+use util::common::{indent, indenter};
 
-use syntax::ast::m_imm;
+use syntax::abi::AbiSet;
+use syntax::ast::{m_const, m_imm, m_mutbl};
 use syntax::ast;
 
 // Note: Coerce is not actually a combiner, in that it does not

branches/try2/src/librustc/middle/typeck/infer/glb.rs

@@ -21,7 +21,7 @@ use middle::typeck::infer::{cres, InferCtxt};
 use middle::typeck::isr_alist;
 use syntax::ast;
 use syntax::ast::{Many, Once, extern_fn, impure_fn, m_const, m_imm, m_mutbl};
-use syntax::ast::{pure_fn, unsafe_fn};
+use syntax::ast::{noreturn, pure_fn, ret_style, return_val, unsafe_fn};
 use syntax::ast::{Onceness, purity};
 use syntax::abi::AbiSet;
 use syntax::codemap::span;

branches/try2/src/libstd/net_tcp.rs

@@ -20,6 +20,7 @@ use uv;
 use uv::iotask;
 use uv::iotask::IoTask;
 
+use core::io::{Reader, ReaderUtil, Writer};
 use core::io;
 use core::libc::size_t;
 use core::libc;
@@ -1438,7 +1439,7 @@ struct TcpBufferedSocketData {
     mut buf_off: uint
 }
 
-#[cfg(test)]
+//#[cfg(test)]
 pub mod test {
     use net::ip;
     use net::tcp::{GenericListenErr, TcpConnectErrData, TcpListenErrData};

branches/try2/src/libsyntax/ast.rs

@@ -10,7 +10,7 @@
 
 // The Rust abstract syntax tree.
 
-use codemap::{span, spanned};
+use codemap::{span, FileName, spanned};
 use abi::AbiSet;
 use opt_vec::OptVec;
 

branches/try2/src/libsyntax/ast_map.rs

@@ -15,6 +15,7 @@ use ast::*;
 use ast;
 use ast_util::{inlined_item_utils, stmt_id};
 use ast_util;
+use attr;
 use codemap;
 use codemap::spanned;
 use diagnostic::span_handler;

branches/try2/src/libsyntax/attr.rs

@@ -19,6 +19,7 @@ use codemap::BytePos;
 use diagnostic::span_handler;
 use parse::comments::{doc_comment_style, strip_doc_comment_decoration};
 
+use core::either::Either;
 use core::vec;
 use core::hashmap::linear::LinearSet;
 use std;

branches/try2/src/libsyntax/ext/deriving/mod.rs

@@ -286,7 +286,7 @@ pub fn create_enum_variant_pattern(cx: @ext_ctxt,
     }
 }
 
-pub fn variant_arg_count(_cx: @ext_ctxt, _span: span, variant: &variant) -> uint {
+pub fn variant_arg_count(cx: @ext_ctxt, span: span, variant: &variant) -> uint {
     match variant.node.kind {
         tuple_variant_kind(ref args) => args.len(),
         struct_variant_kind(ref struct_def) => struct_def.fields.len(),

branches/try2/src/libsyntax/ext/pipes/ast_builder.rs

@@ -16,7 +16,7 @@
 use core::prelude::*;
 
 use abi::AbiSet;
-use ast::ident;
+use ast::{ident, node_id};
 use ast;
 use ast_util;
 use codemap::{span, respan, dummy_sp, spanned};

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

@@ -3777,7 +3777,7 @@ pub impl Parser {
         };
     }
 
-    fn parse_enum_def(&self, _generics: &ast::Generics) -> enum_def {
+    fn parse_enum_def(&self, generics: &ast::Generics) -> enum_def {
         let mut variants = ~[];
         let mut all_nullary = true, have_disr = false;
         while *self.token != token::RBRACE {

branches/try2/src/libsyntax/print/pprust.rs

@@ -11,6 +11,7 @@
 use core::prelude::*;
 
 use abi::AbiSet;
+use abi;
 use ast::{RegionTyParamBound, TraitTyParamBound, required, provided};
 use ast;
 use ast_util;
@@ -2179,7 +2180,7 @@ pub fn print_opt_sigil(s: @ps, opt_sigil: Option<ast::Sigil>) {
 }
 
 pub fn print_fn_header_info(s: @ps,
-                            _opt_sty: Option<ast::self_ty_>,
+                            opt_sty: Option<ast::self_ty_>,
                             opt_purity: Option<ast::purity>,
                             abis: AbiSet,
                             onceness: ast::Onceness,

branches/try2/src/rt/arch/arm/_context.S

@@ -1,6 +1,6 @@
 // Mark stack as non-executable
 #if defined(__linux__) && defined(__ELF__)
-.section	.note.GNU-stack, "", @progbits
+.section	.note.GNU-stack, "", %progbits
 #endif
 
 .text

branches/try2/src/rt/arch/arm/ccall.S

@@ -1,6 +1,6 @@
 // Mark stack as non-executable
 #if defined(__linux__) && defined(__ELF__)
-.section	.note.GNU-stack, "", @progbits
+.section	.note.GNU-stack, "", %progbits
 #endif
 
 .text

branches/try2/src/rt/arch/arm/morestack.S

@@ -1,6 +1,6 @@
 // Mark stack as non-executable
 #if defined(__linux__) && defined(__ELF__)
-.section	.note.GNU-stack, "", @progbits
+.section	.note.GNU-stack, "", %progbits
 #endif
 
 .text

branches/try2/src/rt/arch/arm/record_sp.S

@@ -1,6 +1,6 @@
 // Mark stack as non-executable
 #if defined(__linux__) && defined(__ELF__)
-.section	.note.GNU-stack, "", @progbits
+.section	.note.GNU-stack, "", %progbits
 #endif
 
 .text