Skip to content

rustdoc: move manual "extern crate" statements outside automatic "fn main"s in doctests #48106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2018
Merged

rustdoc: move manual "extern crate" statements outside automatic "fn main"s in doctests #48106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d6597
move manual "extern crate" statements outside auto "fn main" in doctests
QuietMisdreavus Feb 9, 2018
d8d4c58
fix E0260 error index doctest
QuietMisdreavus Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/librustc_resolve/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ Erroneous code example:
extern crate core;
struct core;
fn main() {}
```
There are two possible solutions:
Expand Down
5 changes: 3 additions & 2 deletions src/librustdoc/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,8 @@ fn partition_source(s: &str) -> (String, String) {
for line in s.lines() {
let trimline = line.trim();
let header = trimline.is_whitespace() ||
trimline.starts_with("#![");
trimline.starts_with("#![") ||
trimline.starts_with("extern crate");
if !header || after_header {
after_header = true;
after.push_str(line);
Expand Down Expand Up @@ -858,8 +859,8 @@ use asdf::qwop;
assert_eq!(2+2, 4);";
let expected =
"#![allow(unused)]
fn main() {
extern crate asdf;
fn main() {
use asdf::qwop;
assert_eq!(2+2, 4);
}".to_string();
Expand Down