Skip to content

Commit

Permalink
rustdoc: Fix testing no_run code blocks
Browse files Browse the repository at this point in the history
This was a regression introduced by rust-lang#31250 where the compiler deferred returning
the results of compilation a little too late (after the `Stop` check was looked
at). This commit alters the stop point to first try to return an erroneous
`result` and only if it was successful return the sentinel `Err(0)`.

Closes rust-lang#31576
  • Loading branch information
alexcrichton committed Apr 11, 2016
1 parent 470ca1c commit 42bcb40
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/librustc_driver/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ pub fn compile_input(sess: &Session,
(control.after_analysis.callback)(state);

if control.after_analysis.stop == Compilation::Stop {
return Err(0usize);
return result.and_then(|_| Err(0usize));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_typeck/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ recursion limit (which can be set via the `recursion_limit` attribute).
For a somewhat artificial example:
```compile_fail
```compile_fail,ignore
#![recursion_limit="2"]
struct Foo;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/coerce-expect-unsized.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// pretty-expanded FIXME #23616

#![allow(unknown_features)]
#![feature(box_syntax)]

Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/deriving-via-extension-hash-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// pretty-expanded FIXME #23616

#[derive(Hash)]
enum Foo {
Bar(isize, char),
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/foreign-dupe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// calling pin_thread and that's having weird side-effects.

// pretty-expanded FIXME #23616

#![feature(libc)]

mod rustrt1 {
Expand Down
19 changes: 19 additions & 0 deletions src/test/rustdoc/no-run-still-checks-lints.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags:--test
// should-fail

#![doc(test(attr(deny(warnings))))]

/// ```no_run
/// let a = 3;
/// ```
pub fn foo() {}

0 comments on commit 42bcb40

Please sign in to comment.