Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[beta] backports #68496

Merged
merged 7 commits into from
Jan 24, 2020
Merged

[beta] backports #68496

merged 7 commits into from
Jan 24, 2020

Conversation

Mark-Simulacrum
Copy link
Member

This backports:

It also includes a few formatting commits to permit the backports to proceed cleanly (those are scoped to the relevant files, but still generate noise, of course). This was deemed easier than attempting to manually deal with the formatting.

r? @ghost

Mark-Simulacrum and others added 4 commits January 23, 2020 16:08
@Mark-Simulacrum
fmt data data structures
5d4b639
@nnethercote @Mark-Simulacrum
Revert parts of rust-lang#66405.
6a835ea 
Because it caused major performance regressions in some cases.

That PR had five commits, two of which affected performance, and three
of which were refactorings. This change undoes the performance-affecting
changes, while keeping the refactorings in place.

Fixes rust-lang#67454.
@Mark-Simulacrum
format librustdoc
5386cbd
@dtolnay @Mark-Simulacrum
Distinguish between private items and hidden items in rustdoc
4bed1c7 
I believe rustdoc should not be conflating private items (visibility
lower than `pub`) and hidden items (attribute `doc(hidden)`). This
matters now that Cargo is passing --document-private-items by default
for bin crates. In bin crates that rely on macros, intentionally hidden
implementation details of the macros can overwhelm the actual useful
internal API that one would want to document.

This PR restores the strip-hidden pass when documenting private items,
and introduces a separate unstable --document-hidden-items option to
skip the strip-hidden pass. The two options are orthogonal to one
another.
@Mark-Simulacrum
Copy link
Member Author

I am not including #68494 in this PR (yet); it is likely to be approved for beta backport, but is not yet ready. It is likely that it will have to land as part of the promotion of the beta branch into stable.

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Jan 23, 2020

📌 Commit dd5c2b9545d30206bf79dd89b9bf21c7f8400706 has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 23, 2020
@bors
Copy link
Contributor

bors commented Jan 23, 2020

⌛ Testing commit dd5c2b9545d30206bf79dd89b9bf21c7f8400706 with merge a44d0f20157bc2e0b1c94a5d60a19954e04bed2b...

@rust-highfive
Copy link
Collaborator

The job i686-apple 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. 
2020-01-23T23:43:59.5041680Z [RUSTC-TIMING] tidy test:false 0.597
2020-01-23T23:43:59.5257250Z     Finished release [optimized] target(s) in 1m 37s
2020-01-23T23:43:59.5411750Z [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "i686-apple-darwin" }, target: "i686-apple-darwin", tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 97.722
2020-01-23T23:43:59.5412850Z tidy check
2020-01-23T23:44:01.1264800Z tidy error: /Users/runner/runners/2.164.6/work/1/s/src/librustc_errors/emitter.rs:128: line longer than 100 chars
2020-01-23T23:44:01.1267630Z tidy error: /Users/runner/runners/2.164.6/work/1/s/src/librustc_errors/emitter.rs:586: line longer than 100 chars
2020-01-23T23:44:06.0016710Z Found 485 error codes
2020-01-23T23:44:06.0017680Z Found 0 error codes with no tests
2020-01-23T23:44:06.0018120Z Done!
2020-01-23T23:44:06.0024340Z some tidy checks failed
2020-01-23T23:44:06.0024340Z some tidy checks failed
2020-01-23T23:44:06.0024890Z 
2020-01-23T23:44:06.0025310Z 
2020-01-23T23:44:06.0026830Z command did not execute successfully: "/Users/runner/runners/2.164.6/work/1/s/build/i686-apple-darwin/stage0-tools-bin/tidy" "/Users/runner/runners/2.164.6/work/1/s/src" "/Users/runner/runners/2.164.6/work/1/s/build/i686-apple-darwin/stage0/bin/cargo" "--no-vendor"
2020-01-23T23:44:06.0028050Z 
2020-01-23T23:44:06.0028450Z 
2020-01-23T23:44:06.0035330Z failed to run: /Users/runner/runners/2.164.6/work/1/s/build/bootstrap/debug/bootstrap test
2020-01-23T23:44:06.0035860Z Build completed unsuccessfully in 0:01:48
2020-01-23T23:44:06.0035860Z Build completed unsuccessfully in 0:01:48
2020-01-23T23:44:06.0098760Z == clock drift check ==
2020-01-23T23:44:06.0153300Z   local time: Thu Jan 23 23:44:06 UTC 2020
2020-01-23T23:44:06.0574520Z   network time: Thu, 23 Jan 2020 23:44:06 GMT
2020-01-23T23:44:06.0576010Z == end clock drift check ==
2020-01-23T23:44:06.0617530Z 
2020-01-23T23:44:06.0733470Z ##[error]Bash exited with code '1'.
2020-01-23T23:44:06.0843780Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-01-23T23:44:06.0846700Z ==============================================================================
2020-01-23T23:44:06.0846990Z Task         : Get sources
2020-01-23T23:44:06.0847090Z 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)

@bors
Copy link
Contributor

bors commented Jan 23, 2020

💔 Test failed - checks-azure

@bors 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 Jan 23, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors r+

Forgot that tidy was a thing :/

@bors
Copy link
Contributor

bors commented Jan 23, 2020

📌 Commit b0a99fd has been approved by Mark-Simulacrum

@bors 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 23, 2020
@bors
Copy link
Contributor

bors commented Jan 24, 2020

⌛ Testing commit b0a99fd with merge 3f41b03...

bors added a commit that referenced this pull request Jan 24, 2020
@bors
Auto merge of #68496 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
3f41b03 
[beta] backports

This backports:
 * Do not ICE on malformed suggestion spans #68256
 * Distinguish between private items and hidden items in rustdoc #67875
 *  Revert parts of #66405. #67471

It also includes a few formatting commits to permit the backports to proceed cleanly (those are scoped to the relevant files, but still generate noise, of course). This was deemed easier than attempting to manually deal with the formatting.

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 24, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 3f41b03 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 24, 2020
@bors bors merged commit b0a99fd into rust-lang:beta Jan 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Mark-Simulacrum @bors @rust-highfive @nnethercote @dtolnay @estebank