diff options
| author | bors <bors@rust-lang.org> | 2020-08-21 09:00:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-21 09:00:49 +0000 |
| commit | 32cb8d40eb4382bd67510c0f06fc855063f0fde8 (patch) | |
| tree | 7de4de383051f02b3b79844ea1d531d67b739814 /src | |
| parent | b51651ae9d0161967617be930415705b2e4d5faf (diff) | |
| parent | 2a7f868d7fc99959912e611e16f4b78cc07c4f69 (diff) | |
| download | rust-32cb8d40eb4382bd67510c0f06fc855063f0fde8.tar.gz rust-32cb8d40eb4382bd67510c0f06fc855063f0fde8.zip | |
Auto merge of #75765 - JohnTitor:rollup-lexaoa9, r=JohnTitor
Rollup of 5 pull requests Successful merges: - #75324 (clarify documentation of remove_dir errors) - #75532 (Fix RFC-1014 test) - #75664 (Update mailmap for mati865) - #75727 (Switch to intra-doc links in `core::result`) - #75750 (Move to intra doc links for std::thread documentation) Failed merges: r? @ghost
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/rfcs/rfc-1014-2.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/rfcs/rfc-1014.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/ui/rfcs/rfc-1014-2.rs b/src/test/ui/rfcs/rfc-1014-2.rs index 5be092204d7..7dd65701f12 100644 --- a/src/test/ui/rfcs/rfc-1014-2.rs +++ b/src/test/ui/rfcs/rfc-1014-2.rs @@ -23,7 +23,8 @@ fn close_stdout() { #[cfg(windows)] fn main() { close_stdout(); - println!("hello world"); + println!("hello"); + println!("world"); } #[cfg(not(windows))] diff --git a/src/test/ui/rfcs/rfc-1014.rs b/src/test/ui/rfcs/rfc-1014.rs index 41a036958bf..53b8fddcf31 100644 --- a/src/test/ui/rfcs/rfc-1014.rs +++ b/src/test/ui/rfcs/rfc-1014.rs @@ -30,5 +30,6 @@ fn close_stdout() { fn main() { close_stdout(); - println!("hello world"); + println!("hello"); + println!("world"); } |