Skip to content

Commit 950add4

Browse files
committed
auto merge of #10072 : brson/rust/modelines, r=thestinger
These are relics that serve no purpose.
2 parents f1b8772 + 9a773da commit 950add4

File tree

123 files changed

+2
-125
lines changed

Some content is hidden

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

123 files changed

+2
-125
lines changed

src/test/bench/shootout-pfib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/bad-bang-ann-3.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/bad-bang-ann.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/bogus-tag.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/capture1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/dead-code-ret.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// xfail'd because the lint pass doesn't know to ignore standard library
44
// stuff.
55

6-
// -*- rust -*-
76
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
87
// file at the top-level directory of this distribution and at
98
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/fail-simple.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/foreign-unsafe-fn-called.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/infinite-tag-type-recursion.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/infinite-vec-type-recursion.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/liveness-bad-bang-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/liveness-forgot-ret.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/liveness-init-in-fru.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.
@@ -9,12 +8,12 @@
98
// option. This file may not be copied, modified, or distributed
109
// except according to those terms.
1110

12-
// error-pattern:9:3
11+
// error-pattern:18:3
1312

1413
/* 1
1514
* 2
1615
* 3
1716
*/
1817
fn main() {
19-
%; // parse error on line 9, but is reported on line 6 instead.
18+
%; // parse error on line 18, but is reported on line 6 instead.
2019
}

src/test/compile-fail/non-exhaustive-match-nested.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/not-a-pred.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/pattern-tyvar-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/pattern-tyvar.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/type-shadow.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/unbalanced-doublequote.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/unsafe-fn-assign-deref-ptr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/unsafe-fn-autoderef.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/unsafe-fn-called-from-safe.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/unsafe-fn-deref-ptr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/compile-fail/unsafe-fn-used-as-value.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-fail/linked-failure.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-fail/linked-failure2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-fail/linked-failure3.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-fail/linked-failure4.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-fail/str-overrun.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-fail/vec-overrun.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-pass/auto-instantiate.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
struct Pair<T, U> { a: T, b: U }
1716
struct Triple { x: int, y: int, z: int }

src/test/run-pass/bitwise.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-pass/bool-not.rs

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

1212

1313

14-
// -*- rust -*-
1514
pub fn main() {
1615
if !false { assert!((true)); } else { assert!((false)); }
1716
if !true { assert!((false)); } else { assert!((true)); }

src/test/run-pass/cast.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// -*- rust -*-
1211
pub fn main() {
1312
let i: int = 'Q' as int;
1413
assert_eq!(i, 0x51);

src/test/run-pass/comm.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-pass/complex.rs

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

1212

1313

14-
// -*- rust -*-
1514
type t = int;
1615

1716
fn nothing() { }

src/test/run-pass/dead-code-one-arm-if.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111

1212

1313

14-
// -*- rust -*-
1514
pub fn main() { if 1 == 1 { return; } info!("Paul is dead"); }

src/test/run-pass/deep.rs

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

1212

1313

14-
// -*- rust -*-
1514
fn f(x: int) -> int {
1615
if x == 1 { return 1; } else { let y: int = 1 + f(x - 1); return y; }
1716
}

src/test/run-pass/div-mod.rs

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

1212

1313

14-
// -*- rust -*-
1514
pub fn main() {
1615
let x: int = 15;
1716
let y: int = 5;

src/test/run-pass/drop-on-ret.rs

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

1212

1313

14-
// -*- rust -*-
1514
fn f() -> int {
1615
if true {
1716
let _s: ~str = ~"should not leak";

src/test/run-pass/expr-block-box.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111

1212

1313

14-
// -*- rust -*-
1514
pub fn main() { let x = { @100 }; assert!((*x == 100)); }

src/test/run-pass/expr-block-generic-box2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-pass/expr-block-generic-unique1.rs

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

1111

1212

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

1615
fn test_generic<T:Clone>(expected: ~T, eq: compare<T>) {

src/test/run-pass/expr-block-generic-unique2.rs

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

1111
// xfail-fast
12-
// -*- rust -*-
1312

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

src/test/run-pass/expr-block-generic.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

src/test/run-pass/expr-block-unique.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111

1212

1313

14-
// -*- rust -*-
1514
pub fn main() { let x = { ~100 }; assert!((*x == 100)); }

src/test/run-pass/expr-block.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for standalone blocks as expressions
1716
fn test_basic() { let rs: bool = { true }; assert!((rs)); }

src/test/run-pass/expr-if-box.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for if as expressions returning boxed types
1716
fn test_box() {

src/test/run-pass/expr-if-generic.rs

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

1111
// xfail-fast
12-
// -*- rust -*-
1312

1413
// Tests for if as expressions with dynamic type sizes
1514
type compare<T> = &'static fn(T, T) -> bool;

src/test/run-pass/expr-if-struct.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for if as expressions returning nominal types
1716

src/test/run-pass/expr-if-unique.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for if as expressions returning boxed types
1716
fn test_box() {

src/test/run-pass/expr-if.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for if as expressions
1716
fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); }

src/test/run-pass/expr-match-box.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for match as expressions resulting in boxed types
1716
fn test_box() {

src/test/run-pass/expr-match-generic-unique1.rs

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

1111

1212

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

1615
fn test_generic<T:Clone>(expected: ~T, eq: compare<T>) {

src/test/run-pass/expr-match-generic-unique2.rs

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

1111
// xfail-fast
12-
// -*- rust -*-
1312

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

src/test/run-pass/expr-match-generic.rs

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

1111
// xfail-fast
12-
// -*- rust -*-
1312

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

src/test/run-pass/expr-match-struct.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for match as expressions resulting in struct types
1716
struct R { i: int }

src/test/run-pass/expr-match-unique.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for match as expressions resulting in boxed types
1716
fn test_box() {

src/test/run-pass/expr-match.rs

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

1212

1313

14-
// -*- rust -*-
1514

1615
// Tests for using match as an expression
1716
fn test_basic() {

src/test/run-pass/fact.rs

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

1212

1313

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

src/test/run-pass/fat-arrow-match.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// -*- rust -*-
21
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
32
// file at the top-level directory of this distribution and at
43
// http://rust-lang.org/COPYRIGHT.

0 commit comments

Comments
 (0)