Skip to content

Commit

Permalink
Auto merge of #33512 - birkenfeld:issue-25944, r=sanxiyn
Browse files Browse the repository at this point in the history
rustdoc: remove artificial indentation of doctest code

The indentation makes the examples look nicer when printed (when is this done?), but breaks tests using multi-line string literals.

Fixes: #25944
  • Loading branch information
bors committed May 11, 2016
2 parents 6dbb0e8 + 5606b42 commit 80ec1b9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/doc/book/strings.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ include the newline and the leading spaces:
let s = "foo
bar";

assert_eq!("foo\n bar", s);
assert_eq!("foo\n bar", s);
```

The second, with a `\`, trims the spaces and the newline:
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ pub fn maketest(s: &str, cratename: Option<&str>, dont_insert_main: bool,
prog.push_str(&everything_else);
} else {
prog.push_str("fn main() {\n ");
prog.push_str(&everything_else.replace("\n", "\n "));
prog.push_str(&everything_else);
prog = prog.trim().into();
prog.push_str("\n}");
}
Expand Down
21 changes: 21 additions & 0 deletions src/test/rustdoc/issue-25944.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// 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

/// ```
/// let a = r#"
/// foo
/// bar"#;
/// let b = "\nfoo\nbar";
/// assert_eq!(a, b);
/// ```
pub fn main() {
}

0 comments on commit 80ec1b9

Please sign in to comment.