Split up files with `// ignore-tidy-filelength` #75701

alex-griffiths · 2020-08-19T11:21:39Z

Sorry it's taken me so long to get my act togethern on this, and that even with all the time, not much has been done. Hopefully what I've got here is at least acceptable.

One thing. When I'd build the compiler, I'd get some warnings about missing stability attributes. I wasn't sure the best way to fix this warning, so I've copied and pasted the stability attributes from the structs themselves. I hope this is okay. If not, I can try and fix it.

This is for #60302

rust-highfive · 2020-08-19T11:21:42Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @KodrAus (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

JohnTitor

Please format the changes with ./x.py fmt, at least.

src/librustc_resolve/diagnostics.rs

src/librustc_resolve/binding_error.rs

library/core/src/str/utf8.rs

library/alloc/src/vec/drain.rs

library/core/src/str/indices.rs

library/core/src/str/mod.rs

…3000 lines. x.py fmt changes also included.

library/core/src/str/utf8.rs

petrochenkov · 2020-08-19T12:25:27Z

@alex-griffiths
Could you avoid the changes in librustc_resolve?

If you'd like to do something in this direction, I'd suggest to start with moving #[test] functions into separate files in library/std (rust-lang/compiler-team#344, see #63207 for an example).
That's the change that certainly won't break any internal structure of the affected crates.

… removal of 'allow(missing_docs)' flag

alex-griffiths · 2020-08-19T13:00:21Z

I'm so sorry. I didn't properly check that the changes I made at least built. I'll fix that now.

library/core/src/str/mod.rs

petrochenkov · 2020-08-19T14:04:45Z

@alex-griffiths
Could you squash commits as well, so that librustc_resolve changes are no longer in git history?
(This is not urgent, just something that needs to be done before the merge.)

bors · 2020-08-24T12:51:18Z

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

KodrAus · 2020-09-04T02:32:59Z

Thanks for working on this @alex-griffiths!

It looks like we've got some merge conflicts and a few broken doc links after the move:

core/str/fn.from_utf8_mut.html:25: broken link - core/str/struct.Utf8Error.html
core/str/fn.from_utf8.html:43: broken link - core/str/struct.Utf8Error.html
core/str/utf8/struct.Utf8Error.html:4: broken link - core/std/string/struct.String.html
core/str/utf8/struct.Utf8Error.html:65: broken link - core/std/char/constant.REPLACEMENT_CHARACTER.html
thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:67:9

tesuji · 2020-09-04T06:52:55Z

library/core/src/str/mod.rs

+#[stable(feature = "rust1", since = "1.0.0")]
+pub mod utf8;
+
+#[stable(feature = "rust1", since = "1.0.0")]
+pub mod indices;


You don't need to public these mods.

JohnCSimon · 2020-09-29T04:23:32Z

Ping from triage:
@alex-griffiths can you please address the comments, thank you.

Dylan-DPC-zz · 2020-09-29T15:41:28Z

hi @alex-griffiths thanks for taking the time to contribute. This has been inactive for a while, so I have to close it. If you wish and have the time in future you can open a new PR and we'll take it forward from there :) Thanks

alex-griffiths added 4 commits August 19, 2020 19:57

Extrated drain into it's own module.

8f9c24f

Remove tidy file length comment

b2c02be

Pull Utf8Error and CharIndices structs into their own modules

c8b09e8

Pulled BindingError into it's own module. Fixed references to it.

4a87f4b

rust-highfive assigned KodrAus Aug 19, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2020

JohnTitor requested changes Aug 19, 2020

View reviewed changes

JohnTitor changed the title ~~Split up files with '// ignore-tidy-filelength~~ Split up files with // ignore-tidy-filelength Aug 19, 2020

alex-griffiths added 3 commits August 19, 2020 22:15

Moved Utf8Error doc comments into the Utf8Error module.

64bca9d

Added filelength comment to suppress warning because file is still > …

04d3d93

…3000 lines. x.py fmt changes also included.

Added trailing new lines as well as ran x.py fmt

cd2770e

tesuji reviewed Aug 19, 2020

View reviewed changes

library/core/src/str/utf8.rs Outdated Show resolved Hide resolved

alex-griffiths added 3 commits August 19, 2020 22:33

Remove needless line

acc26d5

Removing changes in librustc_resolve as per @petrochenkov's comment

f564cb6

Added brief module docs for Utf8Errors and CharIndicies. Allowing the…

f7285b0

… removal of 'allow(missing_docs)' flag

tesuji reviewed Aug 19, 2020

View reviewed changes

library/core/src/str/mod.rs Outdated Show resolved Hide resolved

tesuji reviewed Aug 19, 2020

View reviewed changes

library/core/src/str/mod.rs Show resolved Hide resolved

alex-griffiths added 2 commits August 19, 2020 23:29

Fixed incorrect module docs

1d3aef4

Replaced stable annotation that was accidentally removed.

7cc391d

Fix failing from_utf8 intra-doc-link

981dac3

jyn514 mentioned this pull request Aug 21, 2020

Tracking Issue for intra-doc links in libstd #75080

Closed

alex-griffiths mentioned this pull request Sep 3, 2020

Split up files with // ignore-tidy-filelength #60302

Open

8 tasks

tesuji reviewed Sep 4, 2020

View reviewed changes

KodrAus removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 11, 2020

KodrAus added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 11, 2020

Dylan-DPC-zz closed this Sep 29, 2020

Dylan-DPC-zz added S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split up files with `// ignore-tidy-filelength` #75701

Split up files with `// ignore-tidy-filelength` #75701

alex-griffiths commented Aug 19, 2020 •

edited

Loading

rust-highfive commented Aug 19, 2020

JohnTitor left a comment

petrochenkov commented Aug 19, 2020

alex-griffiths commented Aug 19, 2020

petrochenkov commented Aug 19, 2020

bors commented Aug 24, 2020

KodrAus commented Sep 4, 2020

tesuji Sep 4, 2020

JohnCSimon commented Sep 29, 2020

Dylan-DPC-zz commented Sep 29, 2020

Split up files with // ignore-tidy-filelength #75701

Split up files with // ignore-tidy-filelength #75701

Conversation

alex-griffiths commented Aug 19, 2020 • edited Loading

rust-highfive commented Aug 19, 2020

JohnTitor left a comment

Choose a reason for hiding this comment

petrochenkov commented Aug 19, 2020

alex-griffiths commented Aug 19, 2020

petrochenkov commented Aug 19, 2020

bors commented Aug 24, 2020

KodrAus commented Sep 4, 2020

tesuji Sep 4, 2020

Choose a reason for hiding this comment

JohnCSimon commented Sep 29, 2020

Dylan-DPC-zz commented Sep 29, 2020

Split up files with `// ignore-tidy-filelength` #75701

Split up files with `// ignore-tidy-filelength` #75701

alex-griffiths commented Aug 19, 2020 •

edited

Loading