diff options
| author | bors <bors@rust-lang.org> | 2020-12-11 22:00:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-11 22:00:00 +0000 |
| commit | 9eb3a7ceafd1e2c1924177caa18c7cc0c25b413e (patch) | |
| tree | a68004e4e691ad675d5faa8ef2722ecfd13ba126 /src/tools | |
| parent | 2225ee1b62ff089917434aefd9b2bf509cfa087f (diff) | |
| parent | d93f1d6c04fab017a24d868dd766a290321e636c (diff) | |
| download | rust-9eb3a7ceafd1e2c1924177caa18c7cc0c25b413e.tar.gz rust-9eb3a7ceafd1e2c1924177caa18c7cc0c25b413e.zip | |
Auto merge of #79349 - Nemo157:issue-79201, r=jyn514
Apply `doc(cfg)` from parent items while collecting trait impls Because trait impls bypass the standard `clean` hierarchy they do not participate in the `propagate_doc_cfg` pass, so instead we need to pre-collect all possible `doc(cfg)` attributes that will apply to them when cleaning. fixes #79201
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index e9089b4b15b..ccef005173d 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2442,7 +2442,7 @@ impl<'test> TestCx<'test> { }) }; let mut diff = Command::new("diff"); - diff.args(&["-u", "-r"]).args(&[out_dir, &compare_dir]); + diff.args(&["-u", "-r"]).args(&[&compare_dir, out_dir]); let output = if let Some(pager) = pager { let diff_pid = diff.stdout(Stdio::piped()).spawn().expect("failed to run `diff`"); |