Skip to content

Commit dcdcc6f

Browse files
committed
Auto merge of #27571 - TimNN:pretty-no-crate-type, r=alexcrichton
Because I wanted to change the pretty test as little as possible I added `// compiler-flags: --crate-type=lib` to those test that failed because of a missing `main`. Passes `make check-stage1-pretty` locally. cc @nrc cc #27567
2 parents 91c618f + f0ea2b6 commit dcdcc6f

13 files changed

+22
-6
lines changed

src/compiletest/runtest.rs

-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ actual:\n\
315315
// FIXME (#9639): This needs to handle non-utf8 paths
316316
let mut args = vec!("-".to_string(),
317317
"-Zno-trans".to_string(),
318-
"--crate-type=lib".to_string(),
319318
format!("--target={}", target),
320319
"-L".to_string(),
321320
config.build_base.to_str().unwrap().to_string(),

src/test/pretty/blank-lines.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// pp-exact
1214
fn f() -> [isize; 3] {
1315
let picard = 0;

src/test/pretty/block-comment-multiple-asterisks.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// pp-exact
1214
/***
1315
More than two asterisks means that it isn't a doc comment.

src/test/pretty/block-comment-trailing-whitespace.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// pp-exact
1214
fn f() {
1315
/*

src/test/pretty/block-comment-trailing-whitespace2.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// pp-exact
1214
fn f() {
1315
} /*

src/test/pretty/block-disambig.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// A bunch of tests for syntactic forms involving blocks that were
1214
// previously ambiguous (e.g. 'if true { } *val;' gets parsed as a
1315
// binop)

src/test/pretty/doc-comments.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// pp-exact
1214

1315
// some single-line non-doc comment

src/test/pretty/empty-impl.pp

-5
This file was deleted.

src/test/pretty/empty-impl.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
trait X { fn dummy(&self) { } }
1214
impl X for usize { }
1315

src/test/pretty/empty-lines.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// Issue #759
1214
// Whitespace under block opening should not expand forever
1315

src/test/pretty/for-comment.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// pp-exact
1214

1315
fn f(v: &[isize]) -> isize {

src/test/pretty/import-renames.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// pp-exact
1214

1315
use std::io::{self, Error as IoError};

src/test/pretty/unary-op-disambig.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: --crate-type=lib
12+
1113
// Preserve semicolons that disambiguate unops
1214

1315
fn f() { }

0 commit comments

Comments
 (0)