rustdoctest: suppress the default allow(unused) under --display-warnings #49064

QuietMisdreavus · 2018-03-15T22:14:34Z

If you're passing rustdoc --display-warnings, you probably want to see the default ones too. This change modifies test::make_test to suppress the default #![allow(unused)] if the --display-warnings CLI flag was provided to rustdoc.

cc #41574

rust-highfive · 2018-03-15T22:14:36Z

r? @steveklabnik

(rust_highfive has picked a reviewer for you, use r? to override)

QuietMisdreavus · 2018-03-15T22:17:37Z

r? @GuillaumeGomez

GuillaumeGomez · 2018-03-16T09:26:25Z

src/librustdoc/test.rs

+        let mut opts = TestOptions::default();
+        opts.display_warnings = true;
+        let input =
+"assert_eq!(2+2, 4);";


Why this strange indent?

Since make_test doesn't add indentation to any of the code it parses, i moved everything to the far left margin so i wouldn't have to deal with other ways of keeping the indentation right. For these one-line examples it's not necessary but i wanted both the "before" and "after" to be on the same indent level to visually compare them more easily.

GuillaumeGomez · 2018-03-19T09:07:54Z

With last explanation, everything seems good to me. Thanks!

@bors: r+

bors · 2018-03-19T09:07:55Z

📌 Commit 261efb6 has been approved by GuillaumeGomez

kennytm · 2018-03-21T16:58:19Z

Note: This PR is going to have conflict with #49188, since that #[macro_use] extern crate <crate> is going to add one more line.

[01:26:52] ---- test::tests::make_test_display_warnings stdout ----
[01:26:52] 	thread 'test::tests::make_test_display_warnings' panicked at 'assertion failed: `(left == right)`
[01:26:52]   left: `("fn main() {\nassert_eq!(2+2, 4);\n}", 1)`,
[01:26:52]  right: `("fn main() {\nassert_eq!(2+2, 4);\n}", 2)`', librustdoc/test.rs:969:9
[01:26:52] note: Run with `RUST_BACKTRACE=1` for a backtrace.

QuietMisdreavus · 2018-03-21T17:12:24Z

@kennytm Oh right, that will cause some issues. Go ahead and land the other one first, then i'll update this one once that lands.

kennytm · 2018-03-21T20:30:16Z

@bors p=1

(Do not roll this up together with #49188)

…r=GuillaumeGomez rustdoctest: suppress the default allow(unused) under --display-warnings If you're passing rustdoc `--display-warnings`, you probably want to see the default ones too. This change modifies `test::make_test` to suppress the default `#![allow(unused)]` if the `--display-warnings` CLI flag was provided to rustdoc. cc rust-lang#41574

bors · 2018-03-23T14:21:36Z

⌛ Testing commit 261efb6 with merge d412d704baae8d3b0e3aad547a7326a34f45b488...

alexcrichton · 2018-03-23T14:33:03Z

@bors: retry

prioritizing the rollup and I think this only has p=1 to not be in a rollup

bors · 2018-03-23T16:58:33Z

⌛ Testing commit 261efb6 with merge de3aeb349ed842bcfd23d351986f73bdb6e60670...

alexcrichton · 2018-03-23T17:17:30Z

@bors: retry

same reason as before

bors · 2018-03-23T18:32:42Z

⌛ Testing commit 261efb6 with merge 2a9aab802d2eb10933938c961334661b9075349b...

bors · 2018-03-23T23:08:09Z

💔 Test failed - status-travis

kennytm · 2018-03-23T23:12:42Z

Failure is expected. #49064 (comment)

@bors p=0

shepmaster · 2018-03-30T19:17:18Z

Ping from triage @QuietMisdreavus ! It's been a week since we last heard from you, but I'm not sure exactly where the problem is here... Maybe @kennytm or @alexcrichton can chime in with the suggested next step...

QuietMisdreavus · 2018-04-02T14:28:25Z

@shepmaster The failure was expected, because a different PR changed the return value for one of these tests. I need to rebase and fix the test. Due to the all-hands last week, i also let my github notifications slide a little... >_>

QuietMisdreavus · 2018-04-02T19:46:10Z

Rebased and fixed the test. It passed locally, but i'll wait for Travis to be sure.

QuietMisdreavus · 2018-04-05T21:08:47Z

(3 days later... >_>)

Travis passed, gonna poke this one back out.

@bors r=GuillaumeGomez

bors · 2018-04-05T21:08:48Z

📌 Commit 8145a77 has been approved by GuillaumeGomez

GuillaumeGomez · 2018-04-05T22:34:09Z

You did well!

bors · 2018-04-05T23:16:23Z

⌛ Testing commit 8145a77 with merge 486757e28916a381c08697dd514d87dcdc0d2615...

bors · 2018-04-06T03:16:23Z

💥 Test timed out

alexcrichton · 2018-04-06T14:41:17Z

@bors: retry

bors · 2018-04-06T17:38:47Z

⌛ Testing commit 8145a77 with merge eeea94c...

…Gomez rustdoctest: suppress the default allow(unused) under --display-warnings If you're passing rustdoc `--display-warnings`, you probably want to see the default ones too. This change modifies `test::make_test` to suppress the default `#![allow(unused)]` if the `--display-warnings` CLI flag was provided to rustdoc. cc #41574

bors · 2018-04-06T20:15:38Z

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing eeea94c to master...

rust-highfive assigned steveklabnik Mar 15, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 15, 2018

rust-highfive assigned GuillaumeGomez and unassigned steveklabnik Mar 15, 2018

GuillaumeGomez reviewed Mar 16, 2018

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2018

kennytm mentioned this pull request Mar 21, 2018

Rollup of 20 pull requests #49236

Closed

frewsxcv mentioned this pull request Mar 23, 2018

Rollup of 12 pull requests #49302

Closed

frewsxcv mentioned this pull request Mar 23, 2018

Rollup of 13 pull requests #49306

Closed

bors mentioned this pull request Mar 23, 2018

Rollup of 15 pull requests #49308

Merged

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 23, 2018

kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 23, 2018

suppress the default allow(unused) under --display-warnings

8145a77

QuietMisdreavus force-pushed the piercing-the-veil branch from 261efb6 to 8145a77 Compare April 2, 2018 19:37

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 5, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 6, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 6, 2018

bors merged commit 8145a77 into rust-lang:master Apr 6, 2018

QuietMisdreavus deleted the piercing-the-veil branch May 9, 2018 21:01

rustdoctest: suppress the default allow(unused) under --display-warnings #49064

rustdoctest: suppress the default allow(unused) under --display-warnings #49064

Uh oh!

Conversation

QuietMisdreavus commented Mar 15, 2018

Uh oh!

rust-highfive commented Mar 15, 2018

Uh oh!

QuietMisdreavus commented Mar 15, 2018

Uh oh!

GuillaumeGomez Mar 16, 2018

Choose a reason for hiding this comment

Uh oh!

QuietMisdreavus Mar 16, 2018

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez commented Mar 19, 2018

Uh oh!

bors commented Mar 19, 2018

Uh oh!

kennytm commented Mar 21, 2018

Uh oh!

QuietMisdreavus commented Mar 21, 2018

Uh oh!

kennytm commented Mar 21, 2018

Uh oh!

bors commented Mar 23, 2018

Uh oh!

alexcrichton commented Mar 23, 2018

Uh oh!

bors commented Mar 23, 2018

Uh oh!

alexcrichton commented Mar 23, 2018

Uh oh!

bors commented Mar 23, 2018

Uh oh!

bors commented Mar 23, 2018

Uh oh!

kennytm commented Mar 23, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shepmaster commented Mar 30, 2018

Uh oh!

QuietMisdreavus commented Apr 2, 2018

Uh oh!

QuietMisdreavus commented Apr 2, 2018

Uh oh!

QuietMisdreavus commented Apr 5, 2018

Uh oh!

bors commented Apr 5, 2018

Uh oh!

GuillaumeGomez commented Apr 5, 2018

Uh oh!

bors commented Apr 5, 2018

Uh oh!

bors commented Apr 6, 2018

Uh oh!

alexcrichton commented Apr 6, 2018

Uh oh!

bors commented Apr 6, 2018

Uh oh!

bors commented Apr 6, 2018

Uh oh!

Uh oh!

kennytm commented Mar 23, 2018 •

edited

Loading