---

yaml
---
r: 83647
b: refs/heads/try
c: abe648d
h: refs/heads/master
i:
  83645: ef9bac9
  83643: 0c6365b
  83639: 0625c41
  83631: 955fc06
  83615: 946f4df
  83583: fa2e89f
v: v3

Author: thestinger

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 4dc3ff9c80bab9da65f3a8323882ec082a80bbeb
+refs/heads/try: abe648d60854c7dbbc0c9db5f29111268c66961d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libextra/base64.rs

@@ -200,7 +200,7 @@ impl<'self> FromBase64 for &'self str {
                 '0'..'9' => buf |= val + 0x04,
                 '+'|'-' => buf |= 0x3E,
                 '/'|'_' => buf |= 0x3F,
-                '\r'|'\n' => continue,
+                '\r'|'\n' => loop,
                 '=' => break,
                 _ => return Err(format!("Invalid character '{}' at position {}",
                                      self.char_at(idx), idx))

branches/try/src/libextra/fileinput.rs

@@ -303,7 +303,7 @@ impl io::Reader for FileInput {
                     let b = r.read_byte();
 
                     if b < 0 {
-                        continue;
+                        loop;
                     }
 
                     if b == '\n' as int {

branches/try/src/libextra/glob.rs

@@ -211,7 +211,7 @@ impl Pattern {
                                 let cs = parse_char_specifiers(chars.slice(i + 2, i + 3 + j));
                                 tokens.push(AnyExcept(cs));
                                 i += j + 4;
-                                continue;
+                                loop;
                             }
                         }
                     }
@@ -222,7 +222,7 @@ impl Pattern {
                                 let cs = parse_char_specifiers(chars.slice(i + 1, i + 2 + j));
                                 tokens.push(AnyWithin(cs));
                                 i += j + 3;
-                                continue;
+                                loop;
                             }
                         }
                     }

branches/try/src/libextra/hex.rs

@@ -100,7 +100,7 @@ impl<'self> FromHex for &'self str {
                 '0'..'9' => buf |= byte - ('0' as u8),
                 ' '|'\r'|'\n'|'\t' => {
                     buf >>= 4;
-                    continue
+                    loop
                 }
                 _ => return Err(format!("Invalid character '{}' at position {}",
                                         self.char_at(idx), idx))

branches/try/src/libextra/num/bigint.rs

@@ -413,7 +413,7 @@ impl Integer for BigUint {
                 }
                 if d0.is_zero() {
                     n = 2;
-                    continue;
+                    loop;
                 }
                 n = 1;
                 // FIXME(#6102): Assignment operator for BigInt causes ICE

branches/try/src/libextra/priority_queue.rs

@@ -140,7 +140,7 @@ impl<T:Ord> PriorityQueue<T> {
                     let x = replace(&mut self.data[parent], init());
                     move_val_init(&mut self.data[pos], x);
                     pos = parent;
-                    continue
+                    loop
                 }
                 break
             }

branches/try/src/libextra/terminfo/parser/compiled.rs

@@ -276,7 +276,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
         for (i, v) in string_offsets.iter().enumerate() {
             let offset = *v;
             if offset == 0xFFFF { // non-entry
-                continue;
+                loop;
             }
 
             let name = if snames[i] == "_" {
@@ -289,7 +289,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
                 // undocumented: FFFE indicates cap@, which means the capability is not present
                 // unsure if the handling for this is correct
                 string_map.insert(name.to_owned(), ~[]);
-                continue;
+                loop;
             }
 
 

branches/try/src/libextra/url.rs

@@ -359,12 +359,12 @@ pub fn query_to_str(query: &Query) -> ~str {
 pub fn get_scheme(rawurl: &str) -> Result<(~str, ~str), ~str> {
     for (i,c) in rawurl.iter().enumerate() {
         match c {
-          'A' .. 'Z' | 'a' .. 'z' => continue,
+          'A' .. 'Z' | 'a' .. 'z' => loop,
           '0' .. '9' | '+' | '-' | '.' => {
             if i == 0 {
                 return Err(~"url: Scheme must begin with a letter.");
             }
-            continue;
+            loop;
           }
           ':' => {
             if i == 0 {
@@ -420,7 +420,7 @@ fn get_authority(rawurl: &str) ->
     let mut end = len;
 
     for (i,c) in rawurl.iter().enumerate() {
-        if i < 2 { continue; } // ignore the leading //
+        if i < 2 { loop; } // ignore the leading //
 
         // deal with input class first
         match c {
@@ -558,7 +558,7 @@ fn get_path(rawurl: &str, authority: bool) ->
           'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '&' |'\'' | '(' | ')' | '.'
           | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '='
           | '_' | '-' => {
-            continue;
+            loop;
           }
           '?' | '#' => {
             end = i;

branches/try/src/librust/rust.rs

@@ -247,7 +247,7 @@ pub fn main() {
                     os::set_exit_status(exit_code);
                     return;
                 }
-                _ => {}
+                _ => loop
             }
         }
     }

branches/try/src/librustc/back/link.rs

@@ -1004,7 +1004,7 @@ pub fn link_args(sess: Session,
     for cratepath in r.iter() {
         if cratepath.filetype() == Some(".rlib") {
             args.push(cratepath.to_str());
-            continue;
+            loop;
         }
         let dir = cratepath.dirname();
         if dir != ~"" { args.push(~"-L" + dir); }

branches/try/src/librustc/lib/llvm.rs

@@ -11,7 +11,6 @@
 // LLVM wrappers are intended to be called from trans,
 // which already runs in a #[fixed_stack_segment]
 #[allow(cstack)];
-#[allow(non_uppercase_pattern_statics)];
 
 use std::c_str::ToCStr;
 use std::hashmap::HashMap;

branches/try/src/librustc/middle/borrowck/check_loans.rs

@@ -263,8 +263,8 @@ impl<'self> CheckLoanCtxt<'self> {
         debug2!("illegal_if={:?}", illegal_if);
 
         for restr in loan1.restrictions.iter() {
-            if !restr.set.intersects(illegal_if) { continue; }
-            if restr.loan_path != loan2.loan_path { continue; }
+            if !restr.set.intersects(illegal_if) { loop; }
+            if restr.loan_path != loan2.loan_path { loop; }
 
             match (new_loan.mutbl, old_loan.mutbl) {
                 (MutableMutability, MutableMutability) => {

branches/try/src/librustc/middle/check_match.rs

@@ -133,7 +133,6 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[Arm]) {
                     _ => false
                 }
             };
-
             do walk_pat(*pat) |p| {
                 if pat_matches_nan(p) {
                     cx.tcx.sess.span_warn(p.span, "unmatchable NaN in pattern, \

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

@@ -83,7 +83,6 @@ pub enum lint {
     unrecognized_lint,
     non_camel_case_types,
     non_uppercase_statics,
-    non_uppercase_pattern_statics,
     type_limits,
     unused_unsafe,
 
@@ -210,13 +209,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
          default: allow
      }),
 
-    ("non_uppercase_pattern_statics",
-     LintSpec {
-         lint: non_uppercase_pattern_statics,
-         desc: "static constants in match patterns should be all caps",
-         default: warn
-     }),
-
     ("managed_heap_memory",
      LintSpec {
         lint: managed_heap_memory,
@@ -621,7 +613,7 @@ pub fn each_lint(sess: session::Session,
                 ast::MetaList(_, ref metas) => metas,
                 _ => {
                     sess.span_err(meta.span, "malformed lint attribute");
-                    continue;
+                    loop;
                 }
             };
             for meta in metas.iter() {
@@ -1118,22 +1110,6 @@ fn check_item_non_uppercase_statics(cx: &Context, it: &ast::item) {
     }
 }
 
-fn check_pat_non_uppercase_statics(cx: &Context, p: &ast::Pat) {
-    // Lint for constants that look like binding identifiers (#7526)
-    match (&p.node, cx.tcx.def_map.find(&p.id)) {
-        (&ast::PatIdent(_, ref path, _), Some(&ast::DefStatic(_, false))) => {
-            // last identifier alone is right choice for this lint.
-            let ident = path.segments.last().identifier;
-            let s = cx.tcx.sess.str_of(ident);
-            if s.iter().any(|c| c.is_lowercase()) {
-                cx.span_lint(non_uppercase_pattern_statics, path.span,
-                             "static constant in pattern should be all caps");
-            }
-        }
-        _ => {}
-    }
-}
-
 struct UnusedUnsafeLintVisitor { stopping_on_items: bool }
 
 impl SubitemStoppableVisitor for UnusedUnsafeLintVisitor {
@@ -1540,11 +1516,6 @@ struct LintCheckVisitor;
 
 impl Visitor<@mut Context> for LintCheckVisitor {
 
-    fn visit_pat(&mut self, p:@ast::Pat, cx: @mut Context) {
-        check_pat_non_uppercase_statics(cx, p);
-        visit::walk_pat(self, p, cx);
-    }
-
     fn visit_item(&mut self, it:@ast::item, cx: @mut Context) {
 
                 do cx.with_lint_attrs(it.attrs) {

branches/try/src/librustc/middle/privacy.rs

@@ -225,7 +225,7 @@ impl PrivacyVisitor {
     fn check_field(&mut self, span: Span, id: ast::DefId, ident: ast::Ident) {
         let fields = ty::lookup_struct_fields(self.tcx, id);
         for field in fields.iter() {
-            if field.name != ident.name { continue; }
+            if field.name != ident.name { loop; }
             if field.vis == private {
                 self.tcx.sess.span_err(span, format!("field `{}` is private",
                                              token::ident_to_str(&ident)));

branches/try/src/librustc/middle/reachable.rs

@@ -359,7 +359,7 @@ impl ReachableContext {
         while self.worklist.len() > 0 {
             let search_item = self.worklist.pop();
             if scanned.contains(&search_item) {
-                continue
+                loop
             }
             scanned.insert(search_item);
             self.reachable_symbols.insert(search_item);

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

@@ -3333,7 +3333,7 @@ impl Resolver {
             if importresolution.privacy != Public {
                 debug2!("(computing exports) not reexporting private `{}`",
                        interner_get(*name));
-                continue;
+                loop;
             }
             let xs = [TypeNS, ValueNS];
             for ns in xs.iter() {

branches/try/src/librustc/middle/trans/base.rs

@@ -1733,7 +1733,7 @@ pub fn new_fn_ctxt_w_id(ccx: @mut CrateContext,
         fcx.alloca_insert_pt = Some(llvm::LLVMGetFirstInstruction(entry_bcx.llbb));
     }
 
-    if !ty::type_is_voidish(substd_output_type) {
+    if !ty::type_is_voidish(ccx.tcx, substd_output_type) {
         // If the function returns nil/bot, there is no real return
         // value, so do not set `llretptr`.
         if !skip_retptr || uses_outptr {
@@ -1964,7 +1964,7 @@ pub fn trans_closure(ccx: @mut CrateContext,
     // translation calls that don't have a return value (trans_crate,
     // trans_mod, trans_item, et cetera) and those that do
     // (trans_block, trans_expr, et cetera).
-    if body.expr.is_none() || ty::type_is_voidish(block_ty) {
+    if body.expr.is_none() || ty::type_is_voidish(bcx.tcx(), block_ty) {
         bcx = controlflow::trans_block(bcx, body, expr::Ignore);
     } else {
         let dest = expr::SaveIn(fcx.llretptr.unwrap());

branches/try/src/librustc/middle/trans/cabi_arm.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(non_uppercase_pattern_statics)];
-
 use lib::llvm::{llvm, Integer, Pointer, Float, Double, Struct, Array};
 use lib::llvm::{Attribute, StructRetAttribute};
 use middle::trans::cabi::{FnType, LLVMType};

branches/try/src/librustc/middle/trans/cabi_mips.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(non_uppercase_pattern_statics)];
 
 use std::libc::c_uint;
 use std::num;

branches/try/src/librustc/middle/trans/cabi_x86_64.rs

@@ -11,8 +11,6 @@
 // The classification code for the x86_64 ABI is taken from the clay language
 // https://github.com/jckarter/clay/blob/master/compiler/src/externals.cpp
 
-#[allow(non_uppercase_pattern_statics)];
-
 use lib::llvm::{llvm, Integer, Pointer, Float, Double};
 use lib::llvm::{Struct, Array, Attribute};
 use lib::llvm::{StructRetAttribute, ByValAttribute};
@@ -319,7 +317,7 @@ fn llreg_ty(cls: &[RegClass]) -> Type {
                 let vec_ty = Type::vector(&Type::f32(), (vec_len * 2u) as u64);
                 tys.push(vec_ty);
                 i += vec_len;
-                continue;
+                loop;
             }
             SSEFs => {
                 tys.push(Type::f32());

branches/try/src/librustc/middle/trans/callee.rs

@@ -660,7 +660,7 @@ pub fn trans_call_inner(in_cx: @mut Block,
             }
             Some(expr::SaveIn(dst)) => Some(dst),
             Some(expr::Ignore) => {
-                if !ty::type_is_voidish(ret_ty) {
+                if !ty::type_is_voidish(in_cx.tcx(), ret_ty) {
                     Some(alloc_ty(bcx, ret_ty, "__llret"))
                 } else {
                     unsafe {
@@ -735,7 +735,7 @@ pub fn trans_call_inner(in_cx: @mut Block,
             match opt_llretslot {
                 Some(llretslot) => {
                     if !type_of::return_uses_outptr(bcx.ccx(), ret_ty) &&
-                        !ty::type_is_voidish(ret_ty)
+                        !ty::type_is_voidish(bcx.tcx(), ret_ty)
                     {
                         Store(bcx, llret, llretslot);
                     }

branches/try/src/librustc/middle/trans/datum.rs

@@ -195,7 +195,7 @@ pub fn appropriate_mode(ccx: &mut CrateContext, ty: ty::t) -> DatumMode {
      * on whether type is immediate or not.
      */
 
-    if ty::type_is_voidish(ty) {
+    if ty::type_is_voidish(ccx.tcx, ty) {
         ByValue
     } else if type_is_immediate(ccx, ty) {
         ByValue
@@ -271,7 +271,7 @@ impl Datum {
 
         let _icx = push_ctxt("copy_to");
 
-        if ty::type_is_voidish(self.ty) {
+        if ty::type_is_voidish(bcx.tcx(), self.ty) {
             return bcx;
         }
 
@@ -343,7 +343,7 @@ impl Datum {
         debug2!("move_to(self={}, action={:?}, dst={})",
                self.to_str(bcx.ccx()), action, bcx.val_to_str(dst));
 
-        if ty::type_is_voidish(self.ty) {
+        if ty::type_is_voidish(bcx.tcx(), self.ty) {
             return bcx;
         }
 
@@ -432,7 +432,7 @@ impl Datum {
          *
          * Yields the value itself. */
 
-        if ty::type_is_voidish(self.ty) {
+        if ty::type_is_voidish(bcx.tcx(), self.ty) {
             C_nil()
         } else {
             match self.mode {
@@ -469,7 +469,7 @@ impl Datum {
         match self.mode {
             ByRef(_) => self.val,
             ByValue => {
-                if ty::type_is_voidish(self.ty) {
+                if ty::type_is_voidish(bcx.tcx(), self.ty) {
                     C_null(type_of::type_of(bcx.ccx(), self.ty).ptr_to())
                 } else {
                     let slot = alloc_ty(bcx, self.ty, "");

branches/try/src/librustc/middle/trans/expr.rs

@@ -440,7 +440,7 @@ pub fn trans_into(bcx: @mut Block, expr: &ast::Expr, dest: Dest) -> @mut Block {
     debuginfo::set_source_location(bcx.fcx, expr.id, expr.span);
 
     let dest = {
-        if ty::type_is_voidish(ty) {
+        if ty::type_is_voidish(bcx.tcx(), ty) {
             Ignore
         } else {
             dest
@@ -531,7 +531,7 @@ fn trans_to_datum_unadjusted(bcx: @mut Block, expr: &ast::Expr) -> DatumBlock {
 
         ty::RvalueDpsExpr => {
             let ty = expr_ty(bcx, expr);
-            if ty::type_is_voidish(ty) {
+            if ty::type_is_voidish(bcx.tcx(), ty) {
                 bcx = trans_rvalue_dps_unadjusted(bcx, expr, Ignore);
                 return nil(bcx, ty);
             } else {