---

yaml
---
r: 152406
b: refs/heads/try2
c: 966c734
h: refs/heads/master
v: v3

Author: pcwalton

[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: 0ea7aa30cc864d00fc30b9ba610f2daefab4e850
+refs/heads/try2: 966c7346cae89cf47017bfbf27e383d0b0351d82
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/crates.mk

@@ -83,16 +83,16 @@ DEPS_uuid := std serialize
 DEPS_sync := std alloc
 DEPS_getopts := std
 DEPS_collections := core alloc
-DEPS_fourcc := rustc syntax std
-DEPS_hexfloat := rustc syntax std
+DEPS_fourcc := syntax std
+DEPS_hexfloat := syntax std
 DEPS_num := std
 DEPS_test := std getopts serialize term time regex native:rust_test_helpers
 DEPS_time := std serialize sync
 DEPS_rand := core
 DEPS_url := std
 DEPS_log := std sync
 DEPS_regex := std
-DEPS_regex_macros = rustc syntax std regex
+DEPS_regex_macros = syntax std regex
 DEPS_fmt_macros = std
 
 TOOL_DEPS_compiletest := test green rustuv getopts

branches/try2/src/compiletest/compiletest.rs

@@ -18,17 +18,11 @@
 
 extern crate test;
 extern crate getopts;
+#[phase(link, syntax)]
+extern crate log;
 extern crate green;
 extern crate rustuv;
 
-#[cfg(stage0)]
-#[phase(syntax, link)]
-extern crate log;
-
-#[cfg(not(stage0))]
-#[phase(plugin, link)]
-extern crate log;
-
 extern crate regex;
 
 use std::os;

branches/try2/src/doc/rust.md

@@ -1819,8 +1819,9 @@ type int8_t = i8;
 
 ### Function-only attributes
 
-- `plugin_registrar` - mark this function as the registration point for
-  compiler plugins, such as loadable syntax extensions.
+- `macro_registrar` - when using loadable syntax extensions, mark this
+  function as the registration point for the current crate's syntax
+  extensions.
 - `main` - indicates that this function should be passed to the entry point,
   rather than the function in the crate root named `main`.
 - `start` - indicates that this function should be used as the entry point,
@@ -4097,7 +4098,7 @@ that demonstrates all four of them:
 
 ~~~~
 #![feature(phase)]
-#[phase(plugin, link)] extern crate log;
+#[phase(syntax, link)] extern crate log;
 
 fn main() {
     error!("This is an error log")

branches/try2/src/liballoc/lib.rs

@@ -70,14 +70,8 @@
 #![no_std]
 #![feature(phase)]
 
-#[cfg(stage0)]
 #[phase(syntax, link)]
 extern crate core;
-
-#[cfg(not(stage0))]
-#[phase(plugin, link)]
-extern crate core;
-
 extern crate libc;
 
 
@@ -86,10 +80,8 @@ extern crate libc;
 #[cfg(test)] extern crate debug;
 #[cfg(test)] extern crate sync;
 #[cfg(test)] extern crate native;
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
+#[cfg(test)] #[phase(syntax, link)] extern crate std;
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
 
 // Heaps provided for low-level allocation strategies
 

branches/try2/src/libcollections/lib.rs

@@ -23,24 +23,14 @@
 #![feature(macro_rules, managed_boxes, default_type_params, phase, globs)]
 #![no_std]
 
+#[phase(syntax, link)] extern crate core;
 extern crate alloc;
 
-#[cfg(stage0)]
-#[phase(syntax, link)]
-extern crate core;
-
-#[cfg(not(stage0))]
-#[phase(plugin, link)]
-extern crate core;
-
 #[cfg(test)] extern crate native;
 #[cfg(test)] extern crate test;
 #[cfg(test)] extern crate debug;
-
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
+#[cfg(test)] #[phase(syntax, link)] extern crate std;
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
 
 use core::prelude::*;
 

branches/try2/src/libcore/ops.rs

@@ -726,6 +726,27 @@ pub trait DerefMut<Result>: Deref<Result> {
     fn deref_mut<'a>(&'a mut self) -> &'a mut Result;
 }
 
+/// A version of the call operator that takes an immutable receiver.
+#[lang="fn"]
+pub trait Fn<Args,Result> {
+    /// This is called when the call operator is used.
+    fn call(&self, args: Args) -> Result;
+}
+
+/// A version of the call operator that takes a mutable receiver.
+#[lang="fn_mut"]
+pub trait FnMut<Args,Result> {
+    /// This is called when the call operator is used.
+    fn call_mut(&mut self, args: Args) -> Result;
+}
+
+/// A version of the call operator that takes a by-value receiver.
+#[lang="fn_once"]
+pub trait FnOnce<Args,Result> {
+    /// This is called when the call operator is used.
+    fn call_once(self, args: Args) -> Result;
+}
+
 #[cfg(test)]
 mod bench {
     extern crate test;

branches/try2/src/libflate/lib.rs

@@ -28,8 +28,7 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
 #![feature(phase)]
 #![deny(deprecated_owned_vector)]
 
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
 
 extern crate libc;
 

branches/try2/src/libfourcc/lib.rs

@@ -22,7 +22,7 @@ to be `big`, i.e. left-to-right order. It returns a u32.
 To load the extension and use it:
 
 ```rust,ignore
-#[phase(plugin)]
+#[phase(syntax)]
 extern crate fourcc;
 
 fn main() {
@@ -48,25 +48,29 @@ fn main() {
        html_root_url = "http://doc.rust-lang.org/")]
 
 #![deny(deprecated_owned_vector)]
-#![feature(plugin_registrar, managed_boxes)]
+#![feature(macro_registrar, managed_boxes)]
 
 extern crate syntax;
-extern crate rustc;
 
 use syntax::ast;
+use syntax::ast::Name;
 use syntax::attr::contains;
 use syntax::codemap::{Span, mk_sp};
 use syntax::ext::base;
-use syntax::ext::base::{ExtCtxt, MacExpr};
+use syntax::ext::base::{SyntaxExtension, BasicMacroExpander, NormalTT, ExtCtxt, MacExpr};
 use syntax::ext::build::AstBuilder;
 use syntax::parse;
 use syntax::parse::token;
 use syntax::parse::token::InternedString;
-use rustc::plugin::Registry;
 
-#[plugin_registrar]
-pub fn plugin_registrar(reg: &mut Registry) {
-    reg.register_macro("fourcc", expand_syntax_ext);
+#[macro_registrar]
+pub fn macro_registrar(register: |Name, SyntaxExtension|) {
+    register(token::intern("fourcc"),
+        NormalTT(box BasicMacroExpander {
+            expander: expand_syntax_ext,
+            span: None,
+        },
+        None));
 }
 
 pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])

branches/try2/src/libgetopts/lib.rs

@@ -91,8 +91,7 @@
 #![deny(deprecated_owned_vector)]
 
 #[cfg(test)] extern crate debug;
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
 
 use std::cmp::PartialEq;
 use std::result::{Err, Ok};

branches/try2/src/libgreen/lib.rs

@@ -148,7 +148,7 @@
 //!
 //! ```
 //! #![feature(phase)]
-//! #[phase(plugin)] extern crate green;
+//! #[phase(syntax)] extern crate green;
 //!
 //! green_start!(main)
 //!
@@ -211,7 +211,7 @@
 #![allow(visible_private_types)]
 #![deny(deprecated_owned_vector)]
 
-#[cfg(test)] #[phase(plugin, link)] extern crate log;
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
 #[cfg(test)] extern crate rustuv;
 extern crate libc;
 extern crate alloc;
@@ -249,7 +249,7 @@ pub mod task;
 ///
 /// ```
 /// #![feature(phase)]
-/// #[phase(plugin)] extern crate green;
+/// #[phase(syntax)] extern crate green;
 ///
 /// green_start!(main)
 ///

branches/try2/src/libhexfloat/lib.rs

@@ -21,7 +21,7 @@ literal.
 To load the extension and use it:
 
 ```rust,ignore
-#[phase(plugin)]
+#[phase(syntax)]
 extern crate hexfloat;
 
 fn main() {
@@ -45,23 +45,27 @@ fn main() {
        html_root_url = "http://doc.rust-lang.org/")]
 
 #![deny(deprecated_owned_vector)]
-#![feature(plugin_registrar, managed_boxes)]
+#![feature(macro_registrar, managed_boxes)]
 
 extern crate syntax;
-extern crate rustc;
 
 use syntax::ast;
+use syntax::ast::Name;
 use syntax::codemap::{Span, mk_sp};
 use syntax::ext::base;
-use syntax::ext::base::{ExtCtxt, MacExpr};
+use syntax::ext::base::{SyntaxExtension, BasicMacroExpander, NormalTT, ExtCtxt, MacExpr};
 use syntax::ext::build::AstBuilder;
 use syntax::parse;
 use syntax::parse::token;
-use rustc::plugin::Registry;
 
-#[plugin_registrar]
-pub fn plugin_registrar(reg: &mut Registry) {
-    reg.register_macro("hexfloat", expand_syntax_ext);
+#[macro_registrar]
+pub fn macro_registrar(register: |Name, SyntaxExtension|) {
+    register(token::intern("hexfloat"),
+        NormalTT(box BasicMacroExpander {
+            expander: expand_syntax_ext,
+            span: None,
+        },
+        None));
 }
 
 //Check if the literal is valid (as LLVM expects),

branches/try2/src/liblog/lib.rs

@@ -16,7 +16,7 @@ Utilities for program-wide and customizable logging
 
 ```
 #![feature(phase)]
-#[phase(plugin, link)] extern crate log;
+#[phase(syntax, link)] extern crate log;
 
 fn main() {
     debug!("this is a debug {}", "message");

branches/try2/src/liblog/macros.rs

@@ -22,7 +22,7 @@
 ///
 /// ```
 /// #![feature(phase)]
-/// #[phase(plugin, link)] extern crate log;
+/// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
 /// log!(log::DEBUG, "this is a debug message");
@@ -51,7 +51,7 @@ macro_rules! log(
 ///
 /// ```
 /// #![feature(phase)]
-/// #[phase(plugin, link)] extern crate log;
+/// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
 /// # let error = 3;
@@ -69,7 +69,7 @@ macro_rules! error(
 ///
 /// ```
 /// #![feature(phase)]
-/// #[phase(plugin, link)] extern crate log;
+/// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
 /// # let code = 3;
@@ -87,7 +87,7 @@ macro_rules! warn(
 ///
 /// ```
 /// #![feature(phase)]
-/// #[phase(plugin, link)] extern crate log;
+/// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
 /// # let ret = 3;
@@ -107,7 +107,7 @@ macro_rules! info(
 ///
 /// ```
 /// #![feature(phase)]
-/// #[phase(plugin, link)] extern crate log;
+/// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
 /// debug!("x = {x}, y = {y}", x=10, y=20);
@@ -124,7 +124,7 @@ macro_rules! debug(
 ///
 /// ```
 /// #![feature(phase)]
-/// #[phase(plugin, link)] extern crate log;
+/// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
 /// # struct Point { x: int, y: int }

branches/try2/src/librand/lib.rs

@@ -28,28 +28,13 @@
 #![no_std]
 #![experimental]
 
-#[cfg(stage0)]
 #[phase(syntax, link)]
 extern crate core;
 
-#[cfg(not(stage0))]
-#[phase(plugin, link)]
-extern crate core;
-
-#[cfg(test, stage0)]
-#[phase(syntax, link)] extern crate std;
-
-#[cfg(test, stage0)]
-#[phase(syntax, link)] extern crate log;
-
-#[cfg(test, not(stage0))]
-#[phase(plugin, link)] extern crate std;
-
-#[cfg(test, not(stage0))]
-#[phase(plugin, link)] extern crate log;
-
 #[cfg(test)] extern crate native;
 #[cfg(test)] extern crate debug;
+#[cfg(test)] #[phase(syntax, link)] extern crate std;
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
 
 use core::prelude::*;