Rustdoc mutability removal #67487

GuillaumeGomez · 2019-12-21T14:49:03Z

Fixes #67470.

As discussed in another PR, the clean::Mutability type in rustdoc is useless. So let's remove it!

r? @Centril

Centril · 2019-12-21T14:53:38Z

You'll need to rebase this --onto #67355.
r=me with that done.

GuillaumeGomez · 2019-12-21T14:54:21Z

Keeping a tab open meanwhile. ;)

Centril · 2019-12-21T17:36:54Z

#67355 has landed.

Centril · 2019-12-21T21:06:25Z

@bors r+

bors · 2019-12-21T21:06:27Z

📌 Commit e473329aa3a0cf3caa4200bf80a7bab704fb1bf3 has been approved by Centril

bors · 2019-12-21T21:06:28Z

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

rust-highfive · 2019-12-21T21:42:34Z

The job x86_64-gnu-llvm-7 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-21T20:25:48.5580375Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-21T20:25:48.5774886Z ##[command]git config gc.auto 0
2019-12-21T20:25:48.5854582Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-21T20:25:48.5908793Z ##[command]git config --get-all http.proxy
2019-12-21T20:25:48.6064672Z ##[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/67487/merge:refs/remotes/pull/67487/merge
---
2019-12-21T21:23:19.0908517Z .................................................................................................... 1600/9419
2019-12-21T21:23:23.4536357Z .................................................................................................... 1700/9419
2019-12-21T21:23:33.4663192Z .....................................................................................i.............. 1800/9419
2019-12-21T21:23:40.9423343Z .................................................................................................... 1900/9419
2019-12-21T21:23:47.5873992Z ......................................................................iiiii......................... 2000/9419
2019-12-21T21:24:07.4118451Z .................................................................................................... 2200/9419
2019-12-21T21:24:09.7322990Z .................................................................................................... 2300/9419
2019-12-21T21:24:12.3468255Z .................................................................................................... 2400/9419
2019-12-21T21:24:24.8682504Z .................................................................................................... 2500/9419
---
2019-12-21T21:27:03.4321291Z ................................................................................i...............i... 4800/9419
2019-12-21T21:27:10.4664564Z .................................................................................................... 4900/9419
2019-12-21T21:27:19.0800560Z .................................................................................................... 5000/9419
2019-12-21T21:27:23.7048778Z ........................i........................................................................... 5100/9419
2019-12-21T21:27:33.6625854Z ...........................................................................................ii.ii.... 5200/9419
2019-12-21T21:27:42.1734751Z ...........................i........................................................................ 5400/9419
2019-12-21T21:27:50.1825598Z .................................................................................................... 5500/9419
2019-12-21T21:27:58.1452541Z .........................................................................i.......................... 5600/9419
2019-12-21T21:28:05.2696055Z .................................................................................................... 5700/9419
2019-12-21T21:28:05.2696055Z .................................................................................................... 5700/9419
2019-12-21T21:28:11.6919564Z .................................................................................................... 5800/9419
2019-12-21T21:28:21.1322661Z .............................................................ii...i..ii...........i................. 5900/9419
2019-12-21T21:28:42.1509950Z .................................................................................................... 6100/9419
2019-12-21T21:28:49.9274712Z .................................................................................................... 6200/9419
2019-12-21T21:28:49.9274712Z .................................................................................................... 6200/9419
2019-12-21T21:28:57.6507641Z ........................................................................................i..ii....... 6300/9419
2019-12-21T21:29:20.7831315Z .................................................................................................... 6500/9419
2019-12-21T21:29:28.7958650Z ................................................................i................................... 6600/9419
2019-12-21T21:29:30.8601738Z .................................................................................................... 6700/9419
2019-12-21T21:29:33.0894192Z ...............................................................i.................................... 6800/9419
---
2019-12-21T21:31:05.0974664Z .................................................................................................... 7400/9419
2019-12-21T21:31:09.5378257Z .................................................................................................... 7500/9419
2019-12-21T21:31:15.0592375Z .................................................................................................... 7600/9419
2019-12-21T21:31:21.4479673Z .................................................................................................... 7700/9419
2019-12-21T21:31:31.7845322Z ..........................................................................................iiii...... 7800/9419
2019-12-21T21:31:47.8600964Z .....................i......i....................................................................... 8000/9419
2019-12-21T21:31:52.3046420Z .................................................................................................... 8100/9419
2019-12-21T21:32:04.7404833Z .................................................................................................... 8200/9419
2019-12-21T21:32:14.7868638Z .................................................................................................... 8300/9419
---
2019-12-21T21:34:34.1659673Z  finished in 6.099
2019-12-21T21:34:34.1847441Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T21:34:34.3762766Z 
2019-12-21T21:34:34.3763061Z running 166 tests
2019-12-21T21:34:37.2318256Z iiii......i........ii..iiii...i.............................i..i..................i....i............ 100/166
2019-12-21T21:34:39.2497319Z i.i.i...iii..iiiiiii.......................iii............ii......
2019-12-21T21:34:39.2504080Z 
2019-12-21T21:34:39.2509228Z  finished in 5.066
2019-12-21T21:34:39.2717137Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T21:34:39.4451908Z 
---
2019-12-21T21:34:41.3717698Z  finished in 2.100
2019-12-21T21:34:41.3910039Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T21:34:41.5600589Z 
2019-12-21T21:34:41.5600768Z running 9 tests
2019-12-21T21:34:41.5601461Z iiiiiiiii
2019-12-21T21:34:41.5601792Z 
2019-12-21T21:34:41.5603983Z  finished in 0.169
2019-12-21T21:34:41.5835353Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T21:34:41.7911828Z 
---
2019-12-21T21:35:00.7938390Z  finished in 19.209
2019-12-21T21:35:00.8165655Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T21:35:01.0344563Z 
2019-12-21T21:35:01.0345358Z running 124 tests
2019-12-21T21:35:24.4788025Z .iiiii..ii.....i..i...i..i.i.i..i..i..iii....ii.ii....ii..........iiii..........i.....i..ii.......ii 100/124
2019-12-21T21:35:28.4858841Z .i.iii.....iiiiii.....ii
2019-12-21T21:35:28.4859806Z 
2019-12-21T21:35:28.4859894Z  finished in 27.669
2019-12-21T21:35:28.4868064Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T21:35:28.4869821Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-12-21T21:42:21.7135030Z failures:
2019-12-21T21:42:21.7135170Z 
2019-12-21T21:42:21.7137246Z ---- [rustdoc] rustdoc/issue-15318-2.rs stdout ----
2019-12-21T21:42:21.7137463Z 
2019-12-21T21:42:21.7138292Z error: htmldocck failed!
2019-12-21T21:42:21.7138438Z status: exit code: 1
2019-12-21T21:42:21.7139012Z command: "/usr/bin/python2.7" "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/issue-15318-2" "/checkout/src/test/rustdoc/issue-15318-2.rs"
2019-12-21T21:42:21.7140468Z ------------------------------------------
2019-12-21T21:42:21.7140665Z 
2019-12-21T21:42:21.7141030Z ------------------------------------------
2019-12-21T21:42:21.7141208Z stderr:
2019-12-21T21:42:21.7141208Z stderr:
2019-12-21T21:42:21.7141602Z ------------------------------------------
2019-12-21T21:42:21.7142064Z 8: @has check failed
2019-12-21T21:42:21.7142422Z  `XPATH PATTERN` did not match
2019-12-21T21:42:21.7143803Z  // @has issue_15318_2/fn.bar.html '//*[@href="primitive.pointer.html"]' '*mut T'
2019-12-21T21:42:21.7143921Z Encountered 1 errors
2019-12-21T21:42:21.7143943Z 
2019-12-21T21:42:21.7144137Z ------------------------------------------
2019-12-21T21:42:21.7144181Z 
2019-12-21T21:42:21.7144181Z 
2019-12-21T21:42:21.7144200Z 
2019-12-21T21:42:21.7144381Z ---- [rustdoc] rustdoc/issue-15318.rs stdout ----
2019-12-21T21:42:21.7144406Z 
2019-12-21T21:42:21.7144630Z error: htmldocck failed!
2019-12-21T21:42:21.7144665Z status: exit code: 1
2019-12-21T21:42:21.7145046Z command: "/usr/bin/python2.7" "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/issue-15318" "/checkout/src/test/rustdoc/issue-15318.rs"
2019-12-21T21:42:21.7145315Z ------------------------------------------
2019-12-21T21:42:21.7145350Z 
2019-12-21T21:42:21.7145549Z ------------------------------------------
2019-12-21T21:42:21.7145585Z stderr:
2019-12-21T21:42:21.7145585Z stderr:
2019-12-21T21:42:21.7145759Z ------------------------------------------
2019-12-21T21:42:21.7145813Z 8: @has check failed
2019-12-21T21:42:21.7145847Z  `XPATH PATTERN` did not match
2019-12-21T21:42:21.7146091Z  // @has issue_15318/fn.bar.html '//*[@href="http://example.com/issue_15318/primitive.pointer.html"]' '*mut T'
2019-12-21T21:42:21.7146171Z Encountered 1 errors
2019-12-21T21:42:21.7146192Z 
2019-12-21T21:42:21.7146368Z ------------------------------------------
2019-12-21T21:42:21.7146394Z 
---
2019-12-21T21:42:21.7147544Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-12-21T21:42:21.7147588Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-21T21:42:21.7147612Z 
2019-12-21T21:42:21.7147631Z 
2019-12-21T21:42:21.7149722Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/rustdoc" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "rustdoc" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-12-21T21:42:21.7150098Z 
2019-12-21T21:42:21.7150148Z 
2019-12-21T21:42:21.7157693Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-21T21:42:21.7157782Z Build completed unsuccessfully in 1:10:26
2019-12-21T21:42:21.7157782Z Build completed unsuccessfully in 1:10:26
2019-12-21T21:42:21.7212779Z == clock drift check ==
2019-12-21T21:42:21.7228253Z   local time: Sat Dec 21 21:42:21 UTC 2019
2019-12-21T21:42:22.2642136Z   network time: Sat, 21 Dec 2019 21:42:22 GMT
2019-12-21T21:42:22.2643036Z == end clock drift check ==
2019-12-21T21:42:25.4455476Z 
2019-12-21T21:42:25.4555302Z ##[error]Bash exited with code '1'.
2019-12-21T21:42:25.4630328Z ##[section]Starting: Checkout
2019-12-21T21:42:25.4632441Z ==============================================================================
2019-12-21T21:42:25.4632503Z Task         : Get sources
2019-12-21T21:42:25.4632538Z 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)

Centril · 2019-12-21T21:43:14Z

@bors r- ^--

GuillaumeGomez · 2019-12-22T12:32:11Z

I badly replaced one of the pattern matching...

GuillaumeGomez · 2019-12-22T14:39:23Z

@bors: r=Centril

bors · 2019-12-22T14:39:24Z

📌 Commit 0d7a49d has been approved by Centril

bors · 2019-12-22T14:39:25Z

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@Centril

…emoval, r=Centril Rustdoc mutability removal Fixes rust-lang#67470. As discussed in another PR, the `clean::Mutability` type in rustdoc is useless. So let's remove it! r? @Centril

@ghost

Rollup of 8 pull requests Successful merges: - #66877 (Add simpler entry points to const eval for common usages.) - #67299 (Add `ImmTy::try_from_(u)int` methods) - #67487 (Rustdoc mutability removal) - #67499 (Misc MIR building cleanups) - #67506 (Remove iter_private.rs) - #67508 (Fix typo in path parser name) - #67519 (Document why Any is not an unsafe trait) - #67525 (Utilize rust-lang/rust commit hashes in toolstate) Failed merges: r? @ghost

rust-highfive assigned Centril Dec 21, 2019

GuillaumeGomez force-pushed the rustdoc-mutability-removal branch from aec1af9 to c87f8fb Compare December 21, 2019 14:49

This comment has been minimized.

Sign in to view

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 21, 2019

GuillaumeGomez force-pushed the rustdoc-mutability-removal branch from c87f8fb to a6c038d Compare December 21, 2019 19:57

Remove clean::Mutability enum

5a0d747

GuillaumeGomez force-pushed the rustdoc-mutability-removal branch 2 times, most recently from 96efb9c to e473329 Compare December 21, 2019 20:25

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

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

Implement PrintWithSpace trait on hir::Mutability

0d7a49d

GuillaumeGomez force-pushed the rustdoc-mutability-removal branch from e473329 to 0d7a49d Compare December 22, 2019 12:31

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

Centril mentioned this pull request Dec 22, 2019

Rollup of 8 pull requests #67532

Merged

bors merged commit 0d7a49d into rust-lang:master Dec 22, 2019

GuillaumeGomez deleted the rustdoc-mutability-removal branch January 1, 2020 13:30

Rustdoc mutability removal #67487

Rustdoc mutability removal #67487

Uh oh!

Conversation

GuillaumeGomez commented Dec 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Centril commented Dec 21, 2019

Uh oh!

GuillaumeGomez commented Dec 21, 2019

Uh oh!

Centril commented Dec 21, 2019

Uh oh!

This comment has been minimized.

Centril commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

rust-highfive commented Dec 21, 2019

Uh oh!

Centril commented Dec 21, 2019

Uh oh!

GuillaumeGomez commented Dec 22, 2019

Uh oh!

GuillaumeGomez commented Dec 22, 2019

Uh oh!

bors commented Dec 22, 2019

Uh oh!

bors commented Dec 22, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

GuillaumeGomez commented Dec 21, 2019 •

edited

Loading