---

yaml
---
r: 111009
b: refs/heads/snap-stage3
c: 168b2d1
h: refs/heads/master
i:
  111007: ae9f097
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 296e60be6b027a52de58251848037a92f23a0878
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e163ab215105753fd4e9b60a3786ff4636a0c3ff
+refs/heads/snap-stage3: 168b2d1a3f4569706fe4f9a2baee04e37f85d297
 refs/heads/try: 38201d7c6bf0c32b0e5bdc8ecd63976ebc1b3a4c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/doc/guide-macros.md

@@ -407,7 +407,7 @@ As an example, `loop` and `for-loop` labels (discussed in the lifetimes guide)
 will not clash. The following code will print "Hello!" only once:
 
 ~~~
-#[feature(macro_rules)];
+#![feature(macro_rules)]
 
 macro_rules! loop_x (
     ($e: expr) => (

branches/snap-stage3/src/doc/guide-pointers.md

@@ -250,7 +250,7 @@ struct.
 # Managed Pointers
 
 > **Note**: the `@` form of managed pointers is deprecated and behind a
-> feature gate (it requires a `#[feature(managed_pointers)];` attribute on
+> feature gate (it requires a `#![feature(managed_pointers)]` attribute on
 > the crate root; remember the semicolon!). There are replacements, currently 
 > there is `std::rc::Rc` and `std::gc::Gc` for shared ownership via reference
 > counting and garbage collection respectively.

branches/snap-stage3/src/doc/guide-testing.md

@@ -185,7 +185,7 @@ amount.
 For example:
 
 ~~~
-# #[allow(unused_imports)];
+# #![allow(unused_imports)]
 extern crate test;
 
 use std::slice;
@@ -247,7 +247,7 @@ recognize that some calculation has no external effects and remove
 it entirely.
 
 ~~~
-# #[allow(unused_imports)];
+# #![allow(unused_imports)]
 extern crate test;
 use test::Bencher;
 

branches/snap-stage3/src/doc/guide-unsafe.md

@@ -424,14 +424,14 @@ Current valid options are:
 # Avoiding the standard library
 
 By default, `std` is linked to every Rust crate. In some contexts,
-this is undesirable, and can be avoided with the `#[no_std];`
+this is undesirable, and can be avoided with the `#![no_std]`
 attribute attached to the crate.
 
 ```ignore
 # // FIXME #12903: linking failures due to no_std
 // the minimal library
-#[crate_type="lib"];
-#[no_std];
+#![crate_type="lib"]
+#![no_std]
 
 # // fn main() {} tricked you, rustdoc!
 ```
@@ -446,7 +446,7 @@ in the same format as a C:
 
 ```ignore
 # // FIXME #12903: linking failures due to no_std
-#[no_std];
+#![no_std]
 
 extern "rust-intrinsic" { fn abort() -> !; }
 #[no_mangle] pub extern fn rust_stack_exhausted() {
@@ -462,14 +462,14 @@ fn start(_argc: int, _argv: **u8) -> int {
 ```
 
 To override the compiler-inserted `main` shim, one has to disable it
-with `#[no_main];` and then create the appropriate symbol with the
+with `#![no_main]` and then create the appropriate symbol with the
 correct ABI and the correct name, which requires overriding the
 compiler's name mangling too:
 
 ```ignore
 # // FIXME #12903: linking failures due to no_std
-#[no_std];
-#[no_main];
+#![no_std]
+#![no_main]
 
 extern "rust-intrinsic" { fn abort() -> !; }
 #[no_mangle] pub extern fn rust_stack_exhausted() {
@@ -543,7 +543,7 @@ sugar for dynamic allocations via `malloc` and `free`:
 
 ```ignore
 # // FIXME #12903: linking failures due to no_std
-#[no_std];
+#![no_std]
 
 #[allow(ctypes)] // `uint` == `size_t` on Rust's platforms
 extern {

branches/snap-stage3/src/doc/po/ja/rust.md.po

@@ -252,7 +252,7 @@ msgstr "# モジュールとクレート"
 #: src/doc/rust.md:627
 #, fuzzy
 #| msgid "// Turn on a warning #[warn(non_camel_case_types)]"
-msgid "// Turn on a warning #[ warn(non_camel_case_types) ]; ~~~~"
+msgid "// Turn on a warning #![ warn(non_camel_case_types) ] ~~~~"
 msgstr ""
 "// 警告を有効にする\n"
 "#[warn(non_camel_case_types)]"

branches/snap-stage3/src/doc/po/ja/tutorial.md.po

@@ -4851,13 +4851,13 @@ msgstr ""
 #. type: Plain text
 #: src/doc/tutorial.md:3134
 #, fuzzy
-#| msgid "// Make a library (\"bin\" is the default)  #[crate_type = \"lib\"];"
+#| msgid "// Make a library (\"bin\" is the default)  #![crate_type = \"lib\"]"
 msgid ""
 "// This crate is a library (\"bin\" is the default)  #[crate_id = "
-"\"farm#2.5\"]; #[crate_type = \"lib\"];"
+"\"farm#2.5\"]; #![crate_type = \"lib\"]"
 msgstr ""
 "// ライブラリを作成する (\"bin\" がデフォルト値)\n"
-"#[crate_type = \"lib\"];"
+"#![crate_type = \"lib\"]"
 
 #. type: Plain text
 #: src/doc/tutorial.md:3139
@@ -4888,15 +4888,15 @@ msgstr ""
 #: src/doc/tutorial.md:3153
 #, fuzzy
 #| msgid ""
-#| "~~~~ // world.rs #[link(name = \"world\", vers = \"1.0\")]; pub fn "
+#| "~~~~ // world.rs #![link(name = \"world\", vers = \"1.0\")] pub fn "
 #| "explore() -> &str { \"world\" } ~~~~"
 msgid ""
-"~~~~ // `world.rs` #[crate_id = \"world#0.42\"]; # extern crate extra; pub fn "
+"~~~~ // `world.rs` #![crate_id = \"world#0.42\"] # extern crate extra; pub fn "
 "explore() -> &'static str { \"world\" } # fn main() {} ~~~~"
 msgstr ""
 "~~~~\n"
 "// world.rs\n"
-"#[link(name = \"world\", vers = \"1.0\")];\n"
+"#![link(name = \"world\", vers = \"1.0\")]\n"
 "pub fn explore() -> &str { \"world\" }\n"
 "~~~~"
 

branches/snap-stage3/src/doc/rustdoc.md

@@ -13,8 +13,8 @@ comments":
 ~~~
 // the "link" crate attribute is currently required for rustdoc, but normally
 // isn't needed.
-#[crate_id = "universe"];
-#[crate_type="lib"];
+#![crate_id = "universe"]
+#![crate_type="lib"]
 
 //! Tools for dealing with universes (this is a doc comment, and is shown on
 //! the crate index page. The ! makes it apply to the parent of the comment,

branches/snap-stage3/src/doc/tutorial.md

@@ -3096,8 +3096,8 @@ Therefore, if you plan to compile your crate as a library, you should annotate i
 ~~~~
 // `lib.rs`
 
-# #[crate_type = "lib"];
-#[crate_id = "farm#2.5"];
+# #![crate_type = "lib"]
+#![crate_id = "farm#2.5"]
 
 // ...
 # fn farm() {}
@@ -3121,8 +3121,8 @@ or setting the crate type (library or executable) explicitly:
 // ...
 
 // This crate is a library ("bin" is the default)
-#[crate_id = "farm#2.5"];
-#[crate_type = "lib"];
+#![crate_id = "farm#2.5"]
+#![crate_type = "lib"]
 
 // Turn on a warning
 #[warn(non_camel_case_types)]
@@ -3137,7 +3137,7 @@ We define two crates, and use one of them as a library in the other.
 
 ~~~~
 // `world.rs`
-#[crate_id = "world#0.42"];
+#![crate_id = "world#0.42"]
 
 # mod secret_module_to_make_this_test_run {
 pub fn explore() -> &'static str { "world" }
@@ -3211,12 +3211,12 @@ Both auto-insertions can be disabled with an attribute if necessary:
 
 ~~~
 // In the crate root:
-#[no_std];
+#![no_std]
 ~~~
 
 ~~~
 // In any module:
-#[no_implicit_prelude];
+#![no_implicit_prelude]
 ~~~
 
 See the [API documentation][stddoc] for details.

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

@@ -37,7 +37,7 @@
 
 // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py'
 
-#[feature(struct_variant)];
+#![feature(struct_variant)]
 extern crate rand;
 
 {error_deriving}

branches/snap-stage3/src/etc/unicode.py

@@ -411,8 +411,8 @@ def emit_decomp_module(f, canon, compat, combine):
 
 // The following code was generated by "src/etc/unicode.py"
 
-#[allow(missing_doc)];
-#[allow(non_uppercase_statics)];
+#![allow(missing_doc)]
+#![allow(non_uppercase_statics)]
 
 ''')
 

branches/snap-stage3/src/librustc/front/std_inject.rs

@@ -126,7 +126,7 @@ impl<'a> fold::Folder for PreludeInjector<'a> {
     fn fold_crate(&mut self, krate: ast::Crate) -> ast::Crate {
         if !no_prelude(krate.attrs.as_slice()) {
             // only add `use std::prelude::*;` if there wasn't a
-            // `#[no_implicit_prelude];` at the crate level.
+            // `#![no_implicit_prelude]` at the crate level.
             ast::Crate {
                 module: self.fold_mod(&krate.module),
                 ..krate
@@ -138,7 +138,7 @@ impl<'a> fold::Folder for PreludeInjector<'a> {
 
     fn fold_item(&mut self, item: @ast::Item) -> SmallVector<@ast::Item> {
         if !no_prelude(item.attrs.as_slice()) {
-            // only recur if there wasn't `#[no_implicit_prelude];`
+            // only recur if there wasn't `#![no_implicit_prelude]`
             // on this item, i.e. this means that the prelude is not
             // implicitly imported though the whole subtree
             fold::noop_fold_item(item, self)

branches/snap-stage3/src/librustc/middle/astencode.rs

@@ -266,7 +266,7 @@ trait def_id_encoder_helpers {
 
 impl<S:serialize::Encoder<E>, E> def_id_encoder_helpers for S {
     fn emit_def_id(&mut self, did: ast::DefId) {
-        did.encode(self).unwrap()
+        did.encode(self).ok().unwrap()
     }
 }
 
@@ -278,13 +278,13 @@ trait def_id_decoder_helpers {
 
 impl<D:serialize::Decoder<E>, E> def_id_decoder_helpers for D {
     fn read_def_id(&mut self, xcx: &ExtendedDecodeContext) -> ast::DefId {
-        let did: ast::DefId = Decodable::decode(self).unwrap();
+        let did: ast::DefId = Decodable::decode(self).ok().unwrap();
         did.tr(xcx)
     }
 
     fn read_def_id_noxcx(&mut self,
                          cdata: @cstore::crate_metadata) -> ast::DefId {
-        let did: ast::DefId = Decodable::decode(self).unwrap();
+        let did: ast::DefId = Decodable::decode(self).ok().unwrap();
         decoder::translate_def_id(cdata, did)
     }
 }

branches/snap-stage3/src/librustc/middle/typeck/check/regionmanip.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// #[warn(deprecated_mode)];
+// #![warn(deprecated_mode)]
 
 use middle::ty;
 use middle::ty_fold;

branches/snap-stage3/src/librustc/middle/typeck/check/vtable.rs

@@ -242,16 +242,17 @@ fn lookup_vtable(vcx: &VtableContext,
     // bounds to see if they include the trait we are looking for.
     let vtable_opt = match ty::get(ty).sty {
         ty::ty_param(param_ty {idx: n, ..}) => {
-            let type_param_bounds: &[@ty::TraitRef] =
-                vcx.param_env
-                   .type_param_bounds
-                   .get(n)
-                   .trait_bounds
-                   .as_slice();
-            lookup_vtable_from_bounds(vcx, span,
-                                      type_param_bounds,
-                                      param_numbered(n),
-                                      trait_ref)
+            let env_bounds = &vcx.param_env.type_param_bounds;
+            if env_bounds.len() > n {
+                let type_param_bounds: &[@ty::TraitRef] =
+                    env_bounds.get(n).trait_bounds.as_slice();
+                lookup_vtable_from_bounds(vcx, span,
+                                          type_param_bounds,
+                                          param_numbered(n),
+                                          trait_ref)
+            } else {
+                None
+            }
         }
 
         ty::ty_self(_) => {

branches/snap-stage3/src/librustc/util/ppaux.rs

@@ -341,10 +341,8 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> ~str {
       ty_bot => ~"!",
       ty_bool => ~"bool",
       ty_char => ~"char",
-      ty_int(ast::TyI) => ~"int",
-      ty_int(t) => ast_util::int_ty_to_str(t),
-      ty_uint(ast::TyU) => ~"uint",
-      ty_uint(t) => ast_util::uint_ty_to_str(t),
+      ty_int(t) => ast_util::int_ty_to_str(t, None),
+      ty_uint(t) => ast_util::uint_ty_to_str(t, None),
       ty_float(t) => ast_util::float_ty_to_str(t),
       ty_box(typ) => ~"@" + ty_to_str(cx, typ),
       ty_uniq(typ) => ~"~" + ty_to_str(cx, typ),
@@ -367,8 +365,9 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> ~str {
       ty_param(param_ty {idx: id, def_id: did}) => {
           let ident = match cx.ty_param_defs.borrow().find(&did.node) {
               Some(def) => token::get_ident(def.ident).get().to_str(),
-              // This should not happen...
-              None => format!("BUG[{:?}]", id)
+              // This can only happen when a type mismatch error happens and
+              // the actual type has more type parameters than the expected one.
+              None => format!("<generic \\#{}>", id)
           };
           if !cx.sess.verbose() {
               ident