Skip to content

Commit af1faa5

Browse files
author
Keegan McAllister
committed
---
yaml --- r: 152399 b: refs/heads/try2 c: ed41b71 h: refs/heads/master i: 152397: dc9055b 152395: ec672ac 152391: 7190867 152383: 19e9b64 v: v3
1 parent 87f3752 commit af1faa5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+44
-44
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 84243ed6e18643c277724a868e3f11b4137fe3bc
8+
refs/heads/try2: ed41b71fbe69cc920a3a021ac4e96dc4d5cc488c
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/auxiliary/issue-13560-3.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
#![crate_type = "rlib"]
1414
#![feature(phase)]
1515

16-
#[phase(syntax)] extern crate t1 = "issue-13560-1";
17-
#[phase(syntax, link)] extern crate t2 = "issue-13560-2";
16+
#[phase(plugin)] extern crate t1 = "issue-13560-1";
17+
#[phase(plugin, link)] extern crate t2 = "issue-13560-2";
1818

branches/try2/src/test/auxiliary/logging_right_crate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
#![feature(phase)]
12-
#[phase(syntax, link)] extern crate log;
12+
#[phase(plugin, link)] extern crate log;
1313
extern crate debug;
1414

1515
pub fn foo<T>() {

branches/try2/src/test/auxiliary/weak-lang-items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#![feature(phase)]
1818
#![crate_type = "rlib"]
1919

20-
#[phase(syntax, link)]
20+
#[phase(plugin, link)]
2121
extern crate core;
2222

2323
struct A;

branches/try2/src/test/bench/shootout-chameneos-redux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// no-pretty-expanded
1212

1313
#![feature(phase)]
14-
#[phase(syntax)] extern crate green;
14+
#[phase(plugin)] extern crate green;
1515

1616
use std::string::String;
1717
use std::fmt;

branches/try2/src/test/bench/shootout-meteor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
// OF THE POSSIBILITY OF SUCH DAMAGE.
4040

4141
#![feature(phase)]
42-
#[phase(syntax)] extern crate green;
42+
#[phase(plugin)] extern crate green;
4343
extern crate sync;
4444

4545
use sync::Arc;

branches/try2/src/test/bench/shootout-regex-dna.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#![feature(macro_rules, phase)]
4747

4848
extern crate regex;
49-
#[phase(syntax)]extern crate regex_macros;
49+
#[phase(plugin)]extern crate regex_macros;
5050
extern crate sync;
5151

5252
use std::io;

branches/try2/src/test/bench/shootout-spectralnorm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![feature(phase)]
1212
#![allow(non_snake_case_functions)]
13-
#[phase(syntax)] extern crate green;
13+
#[phase(plugin)] extern crate green;
1414
extern crate sync;
1515

1616
use std::from_str::FromStr;

branches/try2/src/test/bench/shootout-threadring.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
#![feature(phase)]
12-
#[phase(syntax)] extern crate green;
12+
#[phase(plugin)] extern crate green;
1313
green_start!(main)
1414

1515
fn start(n_tasks: int, token: int) {

branches/try2/src/test/compile-fail-fulldeps/gated-phase.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// aux-build:macro_crate_test.rs
1212
// ignore-stage1
1313

14-
#[phase(syntax)]
14+
#[phase(plugin)]
1515
//~^ ERROR compile time crate loading is experimental and possibly buggy
1616
extern crate macro_crate_test;
1717

branches/try2/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#![feature(phase)]
1616

17-
#[phase(syntax)]
17+
#[phase(plugin)]
1818
extern crate macro_crate_test;
1919

2020
fn main() {

branches/try2/src/test/compile-fail-fulldeps/macro-crate-unknown-crate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![feature(phase)]
1212

13-
#[phase(syntax)]
13+
#[phase(plugin)]
1414
extern crate doesnt_exist; //~ ERROR can't find crate
1515

1616
fn main() {}

branches/try2/src/test/compile-fail-fulldeps/phase-syntax-doesnt-resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#![feature(phase)]
1616

17-
#[phase(syntax)]
17+
#[phase(plugin)]
1818
extern crate macro_crate_test;
1919

2020
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate fourcc;
1818

1919
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate fourcc;
1818

1919
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate fourcc;
1818

1919
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate fourcc;
1818

1919
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate fourcc;
1818

1919
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate hexfloat;
1818

1919
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate hexfloat;
1818

1919
fn main() {

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#![feature(phase)]
1616

1717
extern crate regex;
18-
#[phase(syntax)] extern crate regex_macros;
18+
#[phase(plugin)] extern crate regex_macros;
1919

2020
// Tests to make sure that `regex!` will produce a compile error when given
2121
// an invalid regular expression.

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#![feature(phase)]
1616

1717
extern crate regex;
18-
#[phase(syntax)] extern crate regex_macros;
18+
#[phase(plugin)] extern crate regex_macros;
1919

2020
#[deny(unused_variable)]
2121
#[deny(dead_code)]

branches/try2/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#![feature(phase)]
1616

1717
extern crate regex;
18-
#[phase(syntax)] extern crate regex_macros;
18+
#[phase(plugin)] extern crate regex_macros;
1919

2020
#[deny(unused_variable)]
2121
#[deny(dead_code)]

branches/try2/src/test/run-fail/rt-set-exit-status-fail.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// error-pattern:whatever
1212

1313
#![feature(phase)]
14-
#[phase(syntax, link)] extern crate log;
14+
#[phase(plugin, link)] extern crate log;
1515
use std::os;
1616

1717
fn main() {

branches/try2/src/test/run-fail/rt-set-exit-status-fail2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// error-pattern:whatever
1212

1313
#![feature(phase)]
14-
#[phase(syntax, link)] extern crate log;
14+
#[phase(plugin, link)] extern crate log;
1515
use std::os;
1616
use std::task;
1717

branches/try2/src/test/run-fail/rt-set-exit-status.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// error-pattern:whatever
1212

1313
#![feature(phase)]
14-
#[phase(syntax, link)] extern crate log;
14+
#[phase(plugin, link)] extern crate log;
1515
use std::os;
1616

1717
fn main() {

branches/try2/src/test/run-make/lto-syntax-extension/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#![feature(phase)]
1212

1313
extern crate lib;
14-
#[phase(syntax)] extern crate fourcc;
14+
#[phase(plugin)] extern crate fourcc;
1515

1616
fn main() {
1717
fourcc!("1234");

branches/try2/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate macro_crate_outlive_expansion_phase;
1818

1919
pub fn main() {}

branches/try2/src/test/run-pass-fulldeps/macro-crate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate macro_crate_test;
1818

1919
#[into_foo]

branches/try2/src/test/run-pass-fulldeps/phase-syntax-link-does-resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#![feature(phase)]
1919

20-
#[phase(syntax, link)]
20+
#[phase(plugin, link)]
2121
extern crate macro_crate_test;
2222

2323
fn main() {

branches/try2/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate fourcc;
1818

1919
static static_val: u32 = fourcc!("foo ");

branches/try2/src/test/run-pass-fulldeps/syntax-extension-hexfloat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// ignore-pretty
1313

1414
#![feature(phase)]
15-
#[phase(syntax)]
15+
#[phase(plugin)]
1616
extern crate hexfloat;
1717

1818
pub fn main() {

branches/try2/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#![feature(phase)]
1616

17-
#[phase(syntax)]
17+
#[phase(plugin)]
1818
extern crate extension = "syntax-extension-with-dll-deps-2";
1919

2020
fn main() {

branches/try2/src/test/run-pass/capturing-logging.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax, link)]
16+
#[phase(plugin, link)]
1717
extern crate log;
1818
extern crate native;
1919

branches/try2/src/test/run-pass/conditional-debug-macro-off.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// exec-env:RUST_LOG=conditional-debug-macro-off=4
1313

1414
#![feature(phase)]
15-
#[phase(syntax, link)]
15+
#[phase(plugin, link)]
1616
extern crate log;
1717
extern crate debug;
1818

branches/try2/src/test/run-pass/issue-14456.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![feature(phase)]
1212

13-
#[phase(syntax, link)]
13+
#[phase(plugin, link)]
1414
extern crate green;
1515
extern crate native;
1616

branches/try2/src/test/run-pass/logging-enabled-debug.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// exec-env:RUST_LOG=logging-enabled-debug=debug
1313

1414
#![feature(phase)]
15-
#[phase(syntax, link)]
15+
#[phase(plugin, link)]
1616
extern crate log;
1717

1818
pub fn main() {

branches/try2/src/test/run-pass/logging-enabled.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// exec-env:RUST_LOG=logging-enabled=info
1212

1313
#![feature(phase)]
14-
#[phase(syntax, link)]
14+
#[phase(plugin, link)]
1515
extern crate log;
1616

1717
pub fn main() {

branches/try2/src/test/run-pass/logging-separate-lines.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax, link)]
16+
#[phase(plugin, link)]
1717
extern crate log;
1818

1919
use std::io::Command;

branches/try2/src/test/run-pass/macro-crate-def-only.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#![feature(phase)]
1414

15-
#[phase(syntax)]
15+
#[phase(plugin)]
1616
extern crate macro_crate_def_only;
1717

1818
pub fn main() {

branches/try2/src/test/run-pass/macro-export-inner-module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#![feature(phase)]
1515

16-
#[phase(syntax)]
16+
#[phase(plugin)]
1717
extern crate macro_export_inner_module;
1818

1919
pub fn main() {

branches/try2/src/test/run-pass/phase-use-ignored.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#![feature(phase)]
1313

14-
#[phase(syntax)]
14+
#[phase(plugin)]
1515
use std::mem;
1616

1717
fn main() {}

branches/try2/src/test/run-pass/tcp-stress.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// exec-env:RUST_LOG=debug
1414

1515
#![feature(phase)]
16-
#[phase(syntax, link)]
16+
#[phase(plugin, link)]
1717
extern crate log;
1818
extern crate libc;
1919
extern crate green;

0 commit comments

Comments
 (0)