Skip to content

Commit

Permalink
auto merge of rust-lang#10072 : brson/rust/modelines, r=thestinger
Browse files Browse the repository at this point in the history
These are relics that serve no purpose.
  • Loading branch information
bors committed Oct 26, 2013
2 parents f1b8772 + 9a773da commit 950add4
Show file tree
Hide file tree
Showing 123 changed files with 2 additions and 125 deletions.
1 change: 0 additions & 1 deletion src/test/bench/shootout-pfib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/bad-bang-ann-3.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/bad-bang-ann.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/bogus-tag.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/capture1.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/dead-code-ret.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// xfail'd because the lint pass doesn't know to ignore standard library
// stuff.

// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/fail-simple.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/foreign-unsafe-fn-called.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/infinite-tag-type-recursion.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/infinite-vec-type-recursion.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/liveness-bad-bang-2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/liveness-forgot-ret.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/liveness-init-in-fru.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
5 changes: 2 additions & 3 deletions src/test/compile-fail/multiline-comment-line-tracking.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand All @@ -9,12 +8,12 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// error-pattern:9:3
// error-pattern:18:3

/* 1
* 2
* 3
*/
fn main() {
%; // parse error on line 9, but is reported on line 6 instead.
%; // parse error on line 18, but is reported on line 6 instead.
}
1 change: 0 additions & 1 deletion src/test/compile-fail/non-exhaustive-match-nested.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/not-a-pred.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/pattern-tyvar-2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/pattern-tyvar.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/type-shadow.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/unbalanced-doublequote.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/unsafe-fn-assign-deref-ptr.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/unsafe-fn-autoderef.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/unsafe-fn-called-from-safe.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/unsafe-fn-deref-ptr.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/unsafe-fn-used-as-value.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-fail/linked-failure.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-fail/linked-failure2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-fail/linked-failure3.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-fail/linked-failure4.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-fail/str-overrun.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-fail/vec-overrun.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/auto-instantiate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

struct Pair<T, U> { a: T, b: U }
struct Triple { x: int, y: int, z: int }
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/bitwise.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/bool-not.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-
pub fn main() {
if !false { assert!((true)); } else { assert!((false)); }
if !true { assert!((false)); } else { assert!((true)); }
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// -*- rust -*-
pub fn main() {
let i: int = 'Q' as int;
assert_eq!(i, 0x51);
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/comm.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/complex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-
type t = int;

fn nothing() { }
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/dead-code-one-arm-if.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@



// -*- rust -*-
pub fn main() { if 1 == 1 { return; } info!("Paul is dead"); }
1 change: 0 additions & 1 deletion src/test/run-pass/deep.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-
fn f(x: int) -> int {
if x == 1 { return 1; } else { let y: int = 1 + f(x - 1); return y; }
}
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/div-mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-
pub fn main() {
let x: int = 15;
let y: int = 5;
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/drop-on-ret.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-
fn f() -> int {
if true {
let _s: ~str = ~"should not leak";
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-block-box.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@



// -*- rust -*-
pub fn main() { let x = { @100 }; assert!((*x == 100)); }
1 change: 0 additions & 1 deletion src/test/run-pass/expr-block-generic-box2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-block-generic-unique1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@



// -*- rust -*-
type compare<'self, T> = &'self fn(~T, ~T) -> bool;

fn test_generic<T:Clone>(expected: ~T, eq: compare<T>) {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-block-generic-unique2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// xfail-fast
// -*- rust -*-

type compare<'self, T> = &'self fn(T, T) -> bool;

Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-block-generic.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-block-unique.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@



// -*- rust -*-
pub fn main() { let x = { ~100 }; assert!((*x == 100)); }
1 change: 0 additions & 1 deletion src/test/run-pass/expr-block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for standalone blocks as expressions
fn test_basic() { let rs: bool = { true }; assert!((rs)); }
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-if-box.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for if as expressions returning boxed types
fn test_box() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-if-generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// xfail-fast
// -*- rust -*-

// Tests for if as expressions with dynamic type sizes
type compare<T> = &'static fn(T, T) -> bool;
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-if-struct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for if as expressions returning nominal types

Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-if-unique.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for if as expressions returning boxed types
fn test_box() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-if.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for if as expressions
fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); }
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-match-box.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for match as expressions resulting in boxed types
fn test_box() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-match-generic-unique1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@



// -*- rust -*-
type compare<T> = &'static fn(~T, ~T) -> bool;

fn test_generic<T:Clone>(expected: ~T, eq: compare<T>) {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-match-generic-unique2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// xfail-fast
// -*- rust -*-

type compare<'self, T> = &'self fn(T, T) -> bool;

Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-match-generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// xfail-fast
// -*- rust -*-

type compare<T> = extern "Rust" fn(T, T) -> bool;

Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-match-struct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for match as expressions resulting in struct types
struct R { i: int }
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-match-unique.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for match as expressions resulting in boxed types
fn test_box() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/expr-match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-

// Tests for using match as an expression
fn test_basic() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/fact.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@



// -*- rust -*-
fn f(x: int) -> int {
// info!("in f:");

Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/fat-arrow-match.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// -*- rust -*-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
Loading

0 comments on commit 950add4

Please sign in to comment.