Move clean types into their own file by GuillaumeGomez · Pull Request #66984 · rust-lang/rust

GuillaumeGomez · 2019-12-03T12:52:08Z

This PR is just about moving clean types into their own files to make the code more clear and keep all Clean trait implementations on their own.

r? @kinnison

rust-highfive · 2019-12-03T21:33:56Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-03T21:24:43.5696387Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-03T21:24:43.5886804Z ##[command]git config gc.auto 0
2019-12-03T21:24:43.5965970Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-03T21:24:43.6039059Z ##[command]git config --get-all http.proxy
2019-12-03T21:24:43.6201055Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66984/merge:refs/remotes/pull/66984/merge
---
2019-12-03T21:30:50.7788214Z    Compiling serde_json v1.0.40
2019-12-03T21:30:52.4907392Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-12-03T21:31:03.5937623Z     Finished release [optimized] target(s) in 1m 26s
2019-12-03T21:31:03.6043379Z tidy check
2019-12-03T21:31:04.2640034Z tidy error: /checkout/src/librustdoc/clean/types.rs: ignoring file length unnecessarily
2019-12-03T21:31:06.3856586Z some tidy checks failed
2019-12-03T21:31:06.3856763Z Found 486 error codes
2019-12-03T21:31:06.3856818Z Found 0 error codes with no tests
2019-12-03T21:31:06.3856872Z Done!
2019-12-03T21:31:06.3856872Z Done!
2019-12-03T21:31:06.3856924Z 
2019-12-03T21:31:06.3856970Z 
2019-12-03T21:31:06.3857964Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-12-03T21:31:06.3858119Z 
2019-12-03T21:31:06.3858149Z 
2019-12-03T21:31:06.3863958Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-12-03T21:31:06.3864125Z Build completed unsuccessfully in 0:01:30
2019-12-03T21:31:06.3864125Z Build completed unsuccessfully in 0:01:30
2019-12-03T21:31:06.3914997Z == clock drift check ==
2019-12-03T21:31:06.3937764Z   local time: Tue Dec  3 21:31:06 UTC 2019
2019-12-03T21:31:06.5405052Z   network time: Tue, 03 Dec 2019 21:31:06 GMT
2019-12-03T21:31:06.5405173Z == end clock drift check ==
2019-12-03T21:31:07.8509744Z 
2019-12-03T21:31:07.8612331Z ##[error]Bash exited with code '1'.
2019-12-03T21:31:07.8642762Z ##[section]Starting: Checkout
2019-12-03T21:31:07.8644556Z ==============================================================================
2019-12-03T21:31:07.8644621Z Task         : Get sources
2019-12-03T21:31:07.8644692Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

rust-highfive · 2019-12-04T10:23:31Z

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-04T09:09:36.5747699Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-04T09:09:36.5760142Z ##[command]git config gc.auto 0
2019-12-04T09:09:36.5762661Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-04T09:09:36.5764841Z ##[command]git config --get-all http.proxy
2019-12-04T09:09:36.5768428Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66984/merge:refs/remotes/pull/66984/merge
---
2019-12-04T09:18:24.2603897Z     Checking rustdoc v0.0.0 (/checkout/src/librustdoc)
2019-12-04T09:18:24.2604490Z error[E0425]: cannot find value `LOCAL_CRATE` in this scope
2019-12-04T09:18:24.2611761Z   --> src/librustdoc/clean/types.rs:99:65
2019-12-04T09:18:24.2643831Z    |
2019-12-04T09:18:24.2644226Z 99 |     let ExternalCrate { name, src, primitives, keywords, .. } = LOCAL_CRATE.clean(cx);
2019-12-04T09:18:24.2644855Z    |
2019-12-04T09:18:24.2645142Z help: possible candidate is found in another module, you can import it into scope
2019-12-04T09:18:24.2645511Z    |
2019-12-04T09:18:24.2645807Z 1  | use rustc::hir::def_id::LOCAL_CRATE;
---
2019-12-04T09:18:24.2647878Z help: possible candidates are found in other modules, you can import them into scope
2019-12-04T09:18:24.2648085Z     |
2019-12-04T09:18:24.2648351Z 1   | use crate::clean::types::Visibility::Public;
2019-12-04T09:18:24.2648585Z     |
2019-12-04T09:18:24.2648851Z 1   | use minifier::js::Keyword::Public;
2019-12-04T09:18:24.2649339Z 1   | use rustc::hir::VisibilityKind::Public;
2019-12-04T09:18:24.2649541Z     |
2019-12-04T09:18:24.2649541Z     |
2019-12-04T09:18:24.2649810Z 1   | use rustc::middle::privacy::AccessLevel::Public;
2019-12-04T09:18:24.2650231Z       and 2 other candidates
2019-12-04T09:18:24.2650262Z 
2019-12-04T09:18:24.2650531Z error[E0425]: cannot find function `get_stability` in this scope
2019-12-04T09:18:24.2650910Z    --> src/librustdoc/clean/types.rs:111:28
---
2019-12-04T09:18:24.2659561Z help: possible candidates are found in other modules, you can import them into scope
2019-12-04T09:18:24.2659805Z     |
2019-12-04T09:18:24.2660124Z 1   | use crate::clean::types::Visibility::Public;
2019-12-04T09:18:24.2660541Z     |
2019-12-04T09:18:24.2660826Z 1   | use minifier::js::Keyword::Public;
2019-12-04T09:18:24.2661345Z 1   | use rustc::hir::VisibilityKind::Public;
2019-12-04T09:18:24.2661765Z     |
2019-12-04T09:18:24.2661765Z     |
2019-12-04T09:18:24.2662212Z 1   | use rustc::middle::privacy::AccessLevel::Public;
2019-12-04T09:18:24.2663237Z       and 2 other candidates
2019-12-04T09:18:24.2663271Z 
2019-12-04T09:18:24.2663571Z error[E0425]: cannot find function `get_stability` in this scope
2019-12-04T09:18:24.2663851Z    --> src/librustdoc/clean/types.rs:123:28
---
2019-12-04T09:18:24.2670345Z     |
2019-12-04T09:18:24.2670634Z 1   | use crate::clean::get_deprecation;
2019-12-04T09:18:24.2670859Z     |
2019-12-04T09:18:24.2670905Z 
2019-12-04T09:18:25.1925192Z error[E0599]: no method named `clean` found for type `rustc::hir::def_id::CrateNum` in the current scope
2019-12-04T09:18:25.1925739Z   --> src/librustdoc/clean/types.rs:72:34
2019-12-04T09:18:25.1926024Z    |
2019-12-04T09:18:25.1926305Z 72 |         externs.push((cnum, cnum.clean(cx)));
2019-12-04T09:18:25.1926660Z    |                                  ^^^^^ method not found in `rustc::hir::def_id::CrateNum`
2019-12-04T09:18:25.1927337Z   ::: src/librustdoc/clean/mod.rs:67:8
2019-12-04T09:18:25.1927581Z    |
2019-12-04T09:18:25.1927581Z    |
2019-12-04T09:18:25.1927873Z 67 |     fn clean(&self, cx: &DocContext<'_>) -> T;
2019-12-04T09:18:25.1928747Z    |        |
2019-12-04T09:18:25.1928747Z    |        |
2019-12-04T09:18:25.1929226Z    |        the method is available for `std::boxed::Box<rustc::hir::def_id::CrateNum>` here
2019-12-04T09:18:25.1929740Z    |        the method is available for `std::sync::Arc<rustc::hir::def_id::CrateNum>` here
2019-12-04T09:18:25.1930342Z    |        the method is available for `std::rc::Rc<rustc::hir::def_id::CrateNum>` here
2019-12-04T09:18:25.1931199Z    = help: items from traits can only be used if the trait is in scope
2019-12-04T09:18:25.1931199Z    = help: items from traits can only be used if the trait is in scope
2019-12-04T09:18:25.1931690Z    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
2019-12-04T09:18:25.1931999Z            `use crate::clean::Clean;`
2019-12-04T09:18:25.1932063Z 
2019-12-04T09:18:25.1997537Z error[E0599]: no method named `clean` found for type `doctree::Module<'_>` in the current scope
2019-12-04T09:18:25.1998075Z   ::: src/librustdoc/doctree.rs:14:1
2019-12-04T09:18:25.1998283Z    |
2019-12-04T09:18:25.1998283Z    |
2019-12-04T09:18:25.1998533Z 14 | pub struct Module<'hir> {
2019-12-04T09:18:25.1998857Z    | ----------------------- method `clean` not found for this
2019-12-04T09:18:25.1999106Z   --> src/librustdoc/clean/types.rs:80:29
2019-12-04T09:18:25.1999330Z    |
2019-12-04T09:18:25.1999702Z 80 |     let mut module = module.clean(cx);
2019-12-04T09:18:25.2000090Z    |                             ^^^^^ method not found in `doctree::Module<'_>`
2019-12-04T09:18:25.2000563Z   ::: src/librustdoc/clean/mod.rs:67:8
2019-12-04T09:18:25.2000766Z    |
2019-12-04T09:18:25.2000766Z    |
2019-12-04T09:18:25.2001033Z 67 |     fn clean(&self, cx: &DocContext<'_>) -> T;
2019-12-04T09:18:25.2001535Z    |        |
2019-12-04T09:18:25.2001535Z    |        |
2019-12-04T09:18:25.2003598Z    |        the method is available for `std::boxed::Box<doctree::Module<'_>>` here
2019-12-04T09:18:25.2004216Z    |        the method is available for `std::sync::Arc<doctree::Module<'_>>` here
2019-12-04T09:18:25.2004532Z    |        the method is available for `std::rc::Rc<doctree::Module<'_>>` here
2019-12-04T09:18:25.2005043Z    = help: items from traits can only be used if the trait is in scope
2019-12-04T09:18:25.2005043Z    = help: items from traits can only be used if the trait is in scope
2019-12-04T09:18:25.2005344Z    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
2019-12-04T09:18:25.2005579Z            `use crate::clean::Clean;`
2019-12-04T09:18:26.6035643Z error: aborting due to 9 previous errors
2019-12-04T09:18:26.6035798Z 
2019-12-04T09:18:26.6036098Z Some errors have detailed explanations: E0425, E0599.
2019-12-04T09:18:26.6036350Z For more information about an error, try `rustc --explain E0425`.
---
2019-12-04T09:18:26.6615607Z   local time: Wed Dec  4 09:18:26 UTC 2019
2019-12-04T09:18:26.7016642Z   network time: Wed, 04 Dec 2019 09:18:26 GMT
2019-12-04T09:18:26.7018973Z == end clock drift check ==
2019-12-04T09:18:28.2858539Z 
2019-12-04T09:18:28.2956955Z ##[error]Bash exited with code '1'.
2019-12-04T09:18:28.2987485Z ##[section]Starting: Checkout
2019-12-04T09:18:28.2989062Z ==============================================================================
2019-12-04T09:18:28.2989113Z Task         : Get sources
2019-12-04T09:18:28.2989172Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

GuillaumeGomez · 2019-12-05T22:33:43Z

ping @kinnison

kinnison · 2019-12-06T10:57:28Z

@GuillaumeGomez Okay, I've been through the commit sequence and it looks clean to me. You can squash it down if you want, or else just let Bors know I approve.

GuillaumeGomez · 2019-12-06T14:01:13Z

Let's keep the commit history as is then, I kinda like the history flow as it is. :)

@bors: r=kinnison

bors · 2019-12-06T14:01:14Z

📌 Commit 12a2671 has been approved by kinnison

@kinnison

…kinnison Move clean types into their own file This PR is just about moving clean types into their own files to make the code more clear and keep all `Clean` trait implementations on their own. r? @kinnison

Centril · 2019-12-07T08:17:07Z

Seems like it failed in #67111 (comment) ? @bors rollup=never r-

GuillaumeGomez · 2019-12-08T11:40:52Z

I ran it locally and no issue. The block code which failed is:

/// Some documentation.
# fn foo() {}
println!("Hello, World!");

I don't see how it could fail. I think the error comes from somewhere else...

@bors: r=kinnison

bors · 2019-12-08T11:40:53Z

📌 Commit 12a2671 has been approved by kinnison

bors · 2019-12-08T22:44:07Z

⌛ Testing commit 12a2671 with merge 14195e1...

@kinnison

Move clean types into their own file This PR is just about moving clean types into their own files to make the code more clear and keep all `Clean` trait implementations on their own. r? @kinnison

bors · 2019-12-09T01:57:01Z

☀️ Test successful - checks-azure
Approved by: kinnison
Pushing 14195e1 to master...

rust-highfive assigned kinnison Dec 3, 2019

JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 3, 2019

GuillaumeGomez added 2 commits December 3, 2019 22:03

Create new types.rs file

c0e78d6

remove code that doesn't belong in clean/mod.rs anymore

72fdce2

GuillaumeGomez force-pushed the move-clean-types branch from bbcf2a3 to be17771 Compare December 3, 2019 21:22

GuillaumeGomez force-pushed the move-clean-types branch from 4f692d1 to de35bb9 Compare December 4, 2019 09:08

GuillaumeGomez added 6 commits December 4, 2019 13:13

remove code that doesn't belong in clean/types.rs

81e549c

fixup clean/types.rs imports

db0e6cd

Make some private methods public

91e021a

Make some formatting improvements

f5e0d0c

Make Lifetime struct field public

e14eebb

Remove unused constant

12a2671

GuillaumeGomez force-pushed the move-clean-types branch from de35bb9 to 12a2671 Compare December 4, 2019 12:14

kinnison 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 Dec 6, 2019

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 Dec 6, 2019

Centril mentioned this pull request Dec 7, 2019

Rollup of 7 pull requests #67111

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 Dec 7, 2019

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 Dec 8, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 9, 2019

bors merged commit 12a2671 into rust-lang:master Dec 9, 2019

This was referenced Dec 9, 2019

Show the actual value of constant values in the documentation #66221

Merged

Allocate HIR on an arena 1/4 #66931

Merged

doc comments: Less attribute mimicking #67151

Merged

GuillaumeGomez deleted the move-clean-types branch December 9, 2019 09:31

Mark-Simulacrum mentioned this pull request Feb 6, 2020

TEXTREL in i686 since 1.41.0 #68794

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Move clean types into their own file#66984

Move clean types into their own file#66984
bors merged 8 commits intorust-lang:masterfrom
GuillaumeGomez:move-clean-types

GuillaumeGomez commented Dec 3, 2019

Uh oh!

rust-highfive commented Dec 3, 2019

Uh oh!

rust-highfive commented Dec 4, 2019

Uh oh!

GuillaumeGomez commented Dec 5, 2019

Uh oh!

kinnison commented Dec 6, 2019

Uh oh!

GuillaumeGomez commented Dec 6, 2019

Uh oh!

bors commented Dec 6, 2019

Uh oh!

Centril commented Dec 7, 2019

Uh oh!

GuillaumeGomez commented Dec 8, 2019

Uh oh!

bors commented Dec 8, 2019

Uh oh!

bors commented Dec 8, 2019

Uh oh!

bors commented Dec 9, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

GuillaumeGomez commented Dec 3, 2019

Uh oh!

rust-highfive commented Dec 3, 2019

Uh oh!

rust-highfive commented Dec 4, 2019

Uh oh!

GuillaumeGomez commented Dec 5, 2019

Uh oh!

kinnison commented Dec 6, 2019

Uh oh!

GuillaumeGomez commented Dec 6, 2019

Uh oh!

bors commented Dec 6, 2019

Uh oh!

Centril commented Dec 7, 2019

Uh oh!

GuillaumeGomez commented Dec 8, 2019

Uh oh!

bors commented Dec 8, 2019

Uh oh!

bors commented Dec 8, 2019

Uh oh!

bors commented Dec 9, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants