---

yaml
---
r: 111008
b: refs/heads/snap-stage3
c: e163ab2
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 296e60be6b027a52de58251848037a92f23a0878
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 246ebd2d5aebc68a581c33c33cbce5f2bc7dc7d6
+refs/heads/snap-stage3: e163ab215105753fd4e9b60a3786ff4636a0c3ff
 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/driver/driver.rs

@@ -310,10 +310,10 @@ pub fn phase_3_run_analysis_passes(sess: Session,
     time(time_passes, "looking for entry point", (),
          |_| middle::entry::find_entry_point(&sess, krate, &ast_map));
 
-    *sess.macro_registrar_fn.borrow_mut() =
+    sess.macro_registrar_fn.set(
         time(time_passes, "looking for macro registrar", (), |_|
             syntax::ext::registrar::find_macro_registrar(
-                sess.diagnostic(), krate));
+                sess.diagnostic(), krate)));
 
     let freevars = time(time_passes, "freevar finding", (), |_|
                         freevars::annotate_freevars(def_map, krate));
@@ -1054,7 +1054,7 @@ pub fn build_session_(sopts: session::Options,
         // For a library crate, this is always none
         entry_fn: RefCell::new(None),
         entry_type: Cell::new(None),
-        macro_registrar_fn: RefCell::new(None),
+        macro_registrar_fn: Cell::new(None),
         default_sysroot: default_sysroot,
         building_library: Cell::new(false),
         local_crate_source_file: local_crate_source_file,

branches/snap-stage3/src/librustc/driver/session.rs

@@ -181,7 +181,7 @@ pub struct Session {
     // For a library crate, this is always none
     pub entry_fn: RefCell<Option<(NodeId, codemap::Span)>>,
     pub entry_type: Cell<Option<EntryFnType>>,
-    pub macro_registrar_fn: RefCell<Option<ast::DefId>>,
+    pub macro_registrar_fn: Cell<Option<ast::NodeId>>,
     pub default_sysroot: Option<Path>,
     pub building_library: Cell<bool>,
     // The name of the root source file of the crate, in the local file system. The path is always

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/metadata/creader.rs

@@ -16,7 +16,6 @@ use back::link;
 use back::svh::Svh;
 use driver::{driver, session};
 use driver::session::Session;
-use metadata::csearch;
 use metadata::cstore;
 use metadata::cstore::CStore;
 use metadata::decoder;
@@ -397,13 +396,14 @@ impl<'a> Loader<'a> {
 impl<'a> CrateLoader for Loader<'a> {
     fn load_crate(&mut self, krate: &ast::ViewItem) -> MacroCrate {
         let info = extract_crate_info(&self.env, krate).unwrap();
-        let (cnum, data, library) = resolve_crate(&mut self.env, &None,
-                                                  info.ident, &info.crate_id,
-                                                  None, true, krate.span);
+        let (_, data, library) = resolve_crate(&mut self.env, &None,
+                                               info.ident, &info.crate_id,
+                                               None, info.should_link,
+                                               krate.span);
         let macros = decoder::get_exported_macros(data);
-        let cstore = &self.env.sess.cstore;
-        let registrar = csearch::get_macro_registrar_fn(cstore, cnum)
-                            .map(|did| csearch::get_symbol(cstore, did));
+        let registrar = decoder::get_macro_registrar_fn(data).map(|id| {
+            decoder::get_symbol(data.data.as_slice(), id)
+        });
         MacroCrate {
             lib: library.dylib,
             macros: macros.move_iter().collect(),

branches/snap-stage3/src/librustc/metadata/csearch.rs

@@ -279,7 +279,7 @@ pub fn get_trait_of_method(cstore: &cstore::CStore,
 
 pub fn get_macro_registrar_fn(cstore: &cstore::CStore,
                               crate_num: ast::CrateNum)
-                              -> Option<ast::DefId> {
+                              -> Option<ast::NodeId> {
     let cdata = cstore.get_crate_data(crate_num);
     decoder::get_macro_registrar_fn(cdata)
 }

branches/snap-stage3/src/librustc/metadata/decoder.rs

@@ -1235,9 +1235,9 @@ pub fn get_native_libraries(cdata: Cmd) -> Vec<(cstore::NativeLibaryKind, ~str)>
     return result;
 }
 
-pub fn get_macro_registrar_fn(cdata: Cmd) -> Option<ast::DefId> {
+pub fn get_macro_registrar_fn(cdata: Cmd) -> Option<ast::NodeId> {
     reader::maybe_get_doc(reader::Doc(cdata.data()), tag_macro_registrar_fn)
-        .map(|doc| item_def_id(doc, cdata))
+        .map(|doc| FromPrimitive::from_u32(reader::doc_as_u32(doc)).unwrap())
 }
 
 pub fn get_exported_macros(cdata: Cmd) -> Vec<~str> {

branches/snap-stage3/src/librustc/metadata/encoder.rs

@@ -1565,12 +1565,8 @@ fn encode_native_libraries(ecx: &EncodeContext, ebml_w: &mut Encoder) {
 }
 
 fn encode_macro_registrar_fn(ecx: &EncodeContext, ebml_w: &mut Encoder) {
-    match *ecx.tcx.sess.macro_registrar_fn.borrow() {
-        Some(did) => {
-            ebml_w.start_tag(tag_macro_registrar_fn);
-            encode_def_id(ebml_w, did);
-            ebml_w.end_tag();
-        }
+    match ecx.tcx.sess.macro_registrar_fn.get() {
+        Some(id) => { ebml_w.wr_tagged_u32(tag_macro_registrar_fn, id); }
         None => {}
     }
 }

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).ok().unwrap()
+        did.encode(self).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).ok().unwrap();
+        let did: ast::DefId = Decodable::decode(self).unwrap();
         did.tr(xcx)
     }
 
     fn read_def_id_noxcx(&mut self,
                          cdata: @cstore::crate_metadata) -> ast::DefId {
-        let did: ast::DefId = Decodable::decode(self).ok().unwrap();
+        let did: ast::DefId = Decodable::decode(self).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,17 +242,16 @@ 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 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
-            }
+            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)
         }
 
         ty::ty_self(_) => {