Remove doctree::Import by CraftSpider · Pull Request #81021 · rust-lang/rust

CraftSpider · 2021-01-14T19:51:28Z

Per the title. Part of cleaning up doctree

rust-highfive · 2021-01-14T19:51:32Z

r? @ollie27

(rust-highfive has picked a reviewer for you, use r? to override)

CraftSpider · 2021-01-14T19:51:43Z

r? @jyn514

jyn514

This is awesome, thank you ❤️

src/librustdoc/clean/mod.rs

jyn514 · 2021-01-14T20:27:46Z

---- [rustdoc-json] rustdoc-json/nested.rs stdout ----

error: compare failed!
status: exit code: 1
command: "/usr/bin/python2.7" "/checkout/src/test/rustdoc-json/compare.py" "/checkout/src/test/rustdoc-json/nested.expected" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/nested/nested.json" "/checkout/src/test/rustdoc-json"
stdout:
------------------------------------------
checking that /checkout/src/test/rustdoc-json/nested.expected is a logical subset of /checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/nested/nested.json

------------------------------------------
stderr:
------------------------------------------
Traceback (most recent call last):
  File "/checkout/src/test/rustdoc-json/compare.py", line 129, in <module>
    main(sys.argv[1], sys.argv[2], normalize(sys.argv[3]))
  File "/checkout/src/test/rustdoc-json/compare.py", line 119, in main
    check_subset(expected_main, actual_main, base_dir)
  File "/checkout/src/test/rustdoc-json/compare.py", line 82, in check_subset
    _check_subset(expected_main["root"], actual_main["root"], [])
  File "/checkout/src/test/rustdoc-json/compare.py", line 76, in _check_subset
    expected_index.get(expected, {}), actual_index.get(actual, {}), trace
  File "/checkout/src/test/rustdoc-json/compare.py", line 58, in _check_subset
    _check_subset(expected[key], actual[key], new_trace)
  File "/checkout/src/test/rustdoc-json/compare.py", line 58, in _check_subset
    _check_subset(expected[key], actual[key], new_trace)
  File "/checkout/src/test/rustdoc-json/compare.py", line 72, in _check_subset
    _check_subset(expected, actual, new_trace)
  File "/checkout/src/test/rustdoc-json/compare.py", line 76, in _check_subset
    expected_index.get(expected, {}), actual_index.get(actual, {}), trace
  File "/checkout/src/test/rustdoc-json/compare.py", line 58, in _check_subset
    _check_subset(expected[key], actual[key], new_trace)
  File "/checkout/src/test/rustdoc-json/compare.py", line 58, in _check_subset
    _check_subset(expected[key], actual[key], new_trace)
  File "/checkout/src/test/rustdoc-json/compare.py", line 72, in _check_subset
    _check_subset(expected, actual, new_trace)
  File "/checkout/src/test/rustdoc-json/compare.py", line 76, in _check_subset
    expected_index.get(expected, {}), actual_index.get(actual, {}), trace
  File "/checkout/src/test/rustdoc-json/compare.py", line 58, in _check_subset
    _check_subset(expected[key], actual[key], new_trace)
  File "/checkout/src/test/rustdoc-json/compare.py", line 44, in _check_subset
    "expected type `{}`, got `{}`".format(expected_type, actual_type), trace
  File "/checkout/src/test/rustdoc-json/compare.py", line 25, in __init__
    super().__init__("{}: {}".format(trace, msg))
TypeError: super() takes at least 1 argument (0 given)

@aDotInTheVoid do you recognize what's going on here?

src/test/rustdoc-json/nested.expected

rust-log-analyzer · 2021-01-15T00:51:42Z

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

configure: rust.channel         := nightly
configure: rust.debug-assertions := True
configure: llvm.assertions      := True
configure: dist.missing-tools   := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure: 
---
Checking which error codes lack tests...
Found 435 error codes
Found 0 error codes with no tests
Done!
tidy error: /checkout/src/test/rustdoc-json/compare.py:10: line longer than 100 chars
some tidy checks failed

command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build"
expected success, got: exit code: 1

jyn514 · 2021-01-15T02:27:11Z

@bors r+

Thanks!

bors · 2021-01-15T02:27:12Z

📌 Commit a70813e has been approved by jyn514

…r=jyn514 Remove doctree::Import Per the title. Part of cleaning up doctree

bors · 2021-01-15T13:02:17Z

☔ The latest upstream changes (presumably #81035) made this pull request unmergeable. Please resolve the merge conflicts.

CraftSpider · 2021-01-15T17:56:56Z

Rebased to fix conflicts

CraftSpider · 2021-01-15T21:15:19Z

@jyn514 Could you re-approve?

jyn514 · 2021-01-15T21:24:58Z

Oops, thanks for the ping.

@bors r+

bors · 2021-01-15T21:24:59Z

📌 Commit 31b17f5 has been approved by jyn514

…r=jyn514 Remove doctree::Import Per the title. Part of cleaning up doctree

Rollup of 17 pull requests Successful merges: - rust-lang#78455 (Introduce {Ref, RefMut}::try_map for optional projections in RefCell) - rust-lang#80144 (Remove giant badge in README) - rust-lang#80614 (Explain why borrows can't be held across yield point in async blocks) - rust-lang#80670 (TrustedRandomAaccess specialization composes incorrectly for nested iter::Zips) - rust-lang#80681 (Clarify what the effects of a 'logic error' are) - rust-lang#80764 (Re-stabilize Weak::as_ptr and friends for unsized T) - rust-lang#80901 (Make `x.py --color always` apply to logging too) - rust-lang#80902 (Add a regression test for rust-lang#76281) - rust-lang#80941 (Do not suggest invalid code in pattern with loop) - rust-lang#80968 (Stabilize the poll_map feature) - rust-lang#80971 (Put all feature gate tests under `feature-gates/`) - rust-lang#81021 (Remove doctree::Import) - rust-lang#81040 (doctest: Reset errors before dropping the parse session) - rust-lang#81060 (Add a regression test for rust-lang#50041) - rust-lang#81065 (codegen_cranelift: Fix redundant semicolon warn) - rust-lang#81069 (Add sample code for Rc::new_cyclic) - rust-lang#81081 (Add test for rust-lang#34792) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

aDotInTheVoid · 2021-01-17T00:06:13Z

@aDotInTheVoid do you recognize what's going on here?

For posterity its a python2/3 thing

rust-highfive assigned ollie27 Jan 14, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 14, 2021

rust-highfive assigned jyn514 and unassigned ollie27 Jan 14, 2021

jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 14, 2021

jyn514 approved these changes Jan 14, 2021

View reviewed changes

src/librustdoc/clean/mod.rs Outdated Show resolved Hide resolved

jyn514 reviewed Jan 15, 2021

View reviewed changes

src/test/rustdoc-json/nested.expected Show resolved Hide resolved

CraftSpider force-pushed the rustdoc-remove-import branch from cef01b7 to a70813e Compare January 15, 2021 00:55

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 Jan 15, 2021

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 15, 2021

Rollup merge of rust-lang#81021 - CraftSpider:rustdoc-remove-import, …

e2e9e34

…r=jyn514 Remove doctree::Import Per the title. Part of cleaning up doctree

JohnTitor mentioned this pull request Jan 15, 2021

Rollup of 6 pull requests #81032

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 15, 2021

CraftSpider added 4 commits January 15, 2021 12:49

Remove doctree::Import

e3274fd

Address nit

2a0c9e2

Fix JSON test

e42c1b9

Add warning to compare.py about error messages

31b17f5

CraftSpider force-pushed the rustdoc-remove-import branch from a70813e to 31b17f5 Compare January 15, 2021 17:50

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 Jan 15, 2021

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 16, 2021

Rollup merge of rust-lang#81021 - CraftSpider:rustdoc-remove-import, …

58c1b90

…r=jyn514 Remove doctree::Import Per the title. Part of cleaning up doctree

JohnTitor mentioned this pull request Jan 16, 2021

Rollup of 10 pull requests #81068

Closed

m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 16, 2021

Rollup merge of rust-lang#81021 - CraftSpider:rustdoc-remove-import, …

69dd8f2

…r=jyn514 Remove doctree::Import Per the title. Part of cleaning up doctree

m-ou-se mentioned this pull request Jan 16, 2021

Rollup of 17 pull requests #81085

Closed

m-ou-se mentioned this pull request Jan 16, 2021

Rollup of 17 pull requests #81089

Merged

bors merged commit 1368e81 into rust-lang:master Jan 16, 2021

rustbot added this to the 1.51.0 milestone Jan 16, 2021

CraftSpider deleted the rustdoc-remove-import branch February 23, 2022 15:53

Uh oh!

Conversation

CraftSpider commented Jan 14, 2021

Uh oh!

rust-highfive commented Jan 14, 2021

Uh oh!

CraftSpider commented Jan 14, 2021

Uh oh!

jyn514 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jyn514 commented Jan 14, 2021

Uh oh!

Uh oh!

rust-log-analyzer commented Jan 15, 2021

Uh oh!

jyn514 commented Jan 15, 2021

Uh oh!

bors commented Jan 15, 2021

Uh oh!

bors commented Jan 15, 2021

Uh oh!

CraftSpider commented Jan 15, 2021

Uh oh!

CraftSpider commented Jan 15, 2021

Uh oh!

jyn514 commented Jan 15, 2021

Uh oh!

bors commented Jan 15, 2021

Uh oh!

aDotInTheVoid commented Jan 17, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants