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.

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

Require issue = "none" over issue = "0" in unstable attributes #67480

Merged
merged 2 commits into from
Dec 22, 2019

Conversation

rossmacarthur
Copy link
Contributor

These changes make the use of issue = "none" required in unstable attributes throughout the compiler.

Notes:

  • support issue = "none" in unstable attributes  #66299 is now in beta so issue = "none" is accepted.
  • The tidy tool now fails on issue = "0".
  • Tests that used issue = "0" were changed to use issue = "none", except for one that asserts issue = "0" can still be used.
  • The compiler still allows issue = "0" because some submodules require it, this could be disallowed once these are updated.

Resolves #41260

r? @varkor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 21, 2019
@Centril
Copy link
Contributor

Centril commented Dec 21, 2019

The compiler still allows issue = "0" because some submodules require it, this could be disallowed once these are updated.

Could you please file a follow-up issue for this?

Also, if you could file a PR against https://rust-lang.github.io/rustc-guide/stability.html that would be great. :)

@Centril
Copy link
Contributor

Centril commented Dec 21, 2019

PR looks good, thank you!

@bors r+

@bors
Copy link
Contributor

bors commented Dec 21, 2019

📌 Commit f7256d2 has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 21, 2019

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

@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 Dec 21, 2019
@Centril
Copy link
Contributor

Centril commented Dec 21, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned varkor Dec 21, 2019
@rust-highfive
Copy link
Collaborator

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-21T11:18:19.0093434Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-21T11:18:19.0292109Z ##[command]git config gc.auto 0
2019-12-21T11:18:19.0366712Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-21T11:18:19.0426568Z ##[command]git config --get-all http.proxy
2019-12-21T11:18:19.0606068Z ##[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/67480/merge:refs/remotes/pull/67480/merge
---
2019-12-21T12:17:14.7903693Z .................................................................................................... 1600/9404
2019-12-21T12:17:19.3261673Z .................................................................................................... 1700/9404
2019-12-21T12:17:30.5038256Z .................................................................................i.................. 1800/9404
2019-12-21T12:17:37.3421352Z .................................................................................................... 1900/9404
2019-12-21T12:17:45.2752718Z ..................................................................iiiii............................. 2000/9404
2019-12-21T12:18:03.9637917Z .................................................................................................... 2200/9404
2019-12-21T12:18:06.3600698Z .................................................................................................... 2300/9404
2019-12-21T12:18:09.2109188Z .................................................................................................... 2400/9404
2019-12-21T12:18:29.5987768Z .................................................................................................... 2500/9404
---
2019-12-21T12:21:04.4361548Z ..........................................................................i...............i......... 4800/9404
2019-12-21T12:21:12.0119199Z .................................................................................................... 4900/9404
2019-12-21T12:21:20.5414272Z .................................................................................................... 5000/9404
2019-12-21T12:21:25.3049719Z ..................i................................................................................. 5100/9404
2019-12-21T12:21:36.3905394Z .....................................................................................ii.ii.......... 5200/9404
2019-12-21T12:21:40.1704504Z .i.................................................................................................. 5300/9404
2019-12-21T12:21:54.2555182Z .................................................................................................... 5500/9404
2019-12-21T12:22:00.9200134Z ...................................................................i................................ 5600/9404
2019-12-21T12:22:08.2949714Z .................................................................................................... 5700/9404
2019-12-21T12:22:15.6676166Z .................................................................................................... 5800/9404
2019-12-21T12:22:15.6676166Z .................................................................................................... 5800/9404
2019-12-21T12:22:24.7864432Z .......................................................ii...i..ii...........i....................... 5900/9404
2019-12-21T12:22:46.3420306Z .................................................................................................... 6100/9404
2019-12-21T12:22:54.3476235Z .................................................................................................... 6200/9404
2019-12-21T12:22:54.3476235Z .................................................................................................... 6200/9404
2019-12-21T12:23:02.8671727Z ................................................................................i..ii............... 6300/9404
2019-12-21T12:23:34.2992177Z .................................................................................................... 6500/9404
2019-12-21T12:23:39.0846434Z .....................................................i.............................................. 6600/9404
2019-12-21T12:23:41.1775880Z .................................................................................................... 6700/9404
2019-12-21T12:23:43.4155743Z ...................................................i................................................ 6800/9404
---
2019-12-21T12:25:20.0817536Z .................................................................................................... 7400/9404
2019-12-21T12:25:23.9413610Z .................................................................................................... 7500/9404
2019-12-21T12:25:29.6262559Z .................................................................................................... 7600/9404
2019-12-21T12:25:37.5539401Z .................................................................................................... 7700/9404
2019-12-21T12:25:47.2590122Z ...........................................................................iiii..................... 7800/9404
2019-12-21T12:26:02.6609026Z ......i......i...................................................................................... 8000/9404
2019-12-21T12:26:07.7711675Z .................................................................................................... 8100/9404
2019-12-21T12:26:21.4605874Z .................................................................................................... 8200/9404
2019-12-21T12:26:30.7531887Z .................................................................................................... 8300/9404
---
2019-12-21T12:28:53.7173776Z  finished in 6.450
2019-12-21T12:28:53.7354966Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T12:28:53.9278978Z 
2019-12-21T12:28:53.9279214Z running 166 tests
2019-12-21T12:28:56.9747890Z iiii......i........ii..iiii...i.............................i..i..................i....i............ 100/166
2019-12-21T12:28:59.0727646Z i.i.i...iii..iiiiiii.......................iii............ii......
2019-12-21T12:28:59.0728806Z 
2019-12-21T12:28:59.0732776Z  finished in 5.337
2019-12-21T12:28:59.0928836Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T12:28:59.2624266Z 
---
2019-12-21T12:29:01.1902834Z  finished in 2.097
2019-12-21T12:29:01.2105154Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T12:29:01.3651231Z 
2019-12-21T12:29:01.3652261Z running 9 tests
2019-12-21T12:29:01.3653427Z iiiiiiiii
2019-12-21T12:29:01.3653804Z 
2019-12-21T12:29:01.3653916Z  finished in 0.154
2019-12-21T12:29:01.3876891Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T12:29:01.5968511Z 
---
2019-12-21T12:29:21.0557316Z  finished in 19.668
2019-12-21T12:29:21.0781728Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T12:29:21.2682288Z 
2019-12-21T12:29:21.2682587Z running 124 tests
2019-12-21T12:29:45.8674981Z .iiiii..ii.....i..i...i..i.i.i..i..i..iii....ii.ii....ii..........iiii..........i.....i..ii.......ii 100/124
2019-12-21T12:29:50.0887896Z .i.iii.....iiiiii.....ii
2019-12-21T12:29:50.0889415Z 
2019-12-21T12:29:50.0889868Z  finished in 29.011
2019-12-21T12:29:50.0896507Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-21T12:29:50.0899504Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-12-21T12:43:10.1371080Z 
2019-12-21T12:43:10.1371880Z    Doc-tests core
2019-12-21T12:43:14.6701609Z 
2019-12-21T12:43:14.6702381Z running 2439 tests
2019-12-21T12:43:23.7671270Z ......iiiii......................................................................................... 100/2439
2019-12-21T12:43:32.5917917Z ..................................................................................ii................ 200/2439
2019-12-21T12:43:53.0787302Z ................i................................................................................... 400/2439
2019-12-21T12:43:53.0787302Z ................i................................................................................... 400/2439
2019-12-21T12:44:02.2161528Z ................................................................i..i..................iiii.......... 500/2439
2019-12-21T12:44:18.2923681Z .................................................................................................... 700/2439
2019-12-21T12:44:26.6834563Z .................................................................................................... 800/2439
2019-12-21T12:44:35.1009822Z .................................................................................................... 900/2439
2019-12-21T12:44:43.4874837Z .................................................................................................... 1000/2439
---
2019-12-21T12:48:25.0687567Z 
2019-12-21T12:48:25.0688942Z running 1003 tests
2019-12-21T12:48:42.7460434Z i................................................................................................... 100/1003
2019-12-21T12:48:52.5426744Z .................................................................................................... 200/1003
2019-12-21T12:48:59.4526339Z ..................iii......i......i...i......i...................................................... 300/1003
2019-12-21T12:49:04.1425891Z .................................................................................................... 400/1003
2019-12-21T12:49:10.8195955Z ..........................................i..i.....................................ii............... 500/1003
2019-12-21T12:49:23.3420221Z .................................................................................................... 700/1003
2019-12-21T12:49:23.3420221Z .................................................................................................... 700/1003
2019-12-21T12:49:29.6147051Z .............................iiii................................................................... 800/1003
2019-12-21T12:49:43.5280941Z .................................................................................................... 900/1003
2019-12-21T12:49:50.1600996Z ...................................................iiii............................................. 1000/1003
2019-12-21T12:49:50.2340545Z test result: ok. 983 passed; 0 failed; 20 ignored; 0 measured; 0 filtered out
2019-12-21T12:49:50.2340769Z 
2019-12-21T12:49:50.2450302Z  finished in 176.913
2019-12-21T12:49:51.1052504Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
2019-12-21T12:58:33.8362166Z 
2019-12-21T12:58:33.8673818Z error[E0308]: mismatched types
2019-12-21T12:58:33.8675027Z   --> src/tools/unstable-book-gen/src/main.rs:95:33
2019-12-21T12:58:33.8675754Z    |
2019-12-21T12:58:33.8676514Z 95 | ...                   feature.tracking_issue.unwrap());
2019-12-21T12:58:33.8677894Z    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u32`, found struct `std::num::NonZeroU32`
2019-12-21T12:58:33.8830610Z error: aborting due to 2 previous errors
2019-12-21T12:58:33.8835218Z 
2019-12-21T12:58:33.8842056Z For more information about this error, try `rustc --explain E0308`.
2019-12-21T12:58:33.8946519Z error: could not compile `unstable-book-gen`.
---
2019-12-21T12:58:33.9069185Z   local time: Sat Dec 21 12:58:33 UTC 2019
2019-12-21T12:58:34.2278895Z   network time: Sat, 21 Dec 2019 12:58:34 GMT
2019-12-21T12:58:34.2283207Z == end clock drift check ==
2019-12-21T12:58:35.6895389Z 
2019-12-21T12:58:35.6990070Z ##[error]Bash exited with code '1'.
2019-12-21T12:58:35.7027121Z ##[section]Starting: Checkout
2019-12-21T12:58:35.7028930Z ==============================================================================
2019-12-21T12:58:35.7028997Z Task         : Get sources
2019-12-21T12:58:35.7029038Z 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
Copy link
Contributor

Centril commented Dec 21, 2019

@bors r- ^--

@bors 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
@LeSeulArtichaut
Copy link
Contributor

rossmacarthur#1 should fix

@Centril
Copy link
Contributor

Centril commented Dec 21, 2019

r=me when green

@Centril
Copy link
Contributor

Centril commented Dec 22, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Dec 22, 2019

📌 Commit 62714f8 has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 22, 2019

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

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 22, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
…-0-part-2, r=Centril

Require issue = "none" over issue = "0" in unstable attributes

These changes make the use of `issue = "none"` required in unstable attributes throughout the compiler.

Notes:
- rust-lang#66299 is now in beta so `issue = "none"` is accepted.
- The `tidy` tool now fails on `issue = "0"`.
- Tests that used `issue = "0"` were changed to use `issue = "none"`, except for _one_ that asserts `issue = "0"` can still be used.
- The compiler still allows `issue = "0"` because some submodules require it, this could be disallowed once these are updated.

Resolves rust-lang#41260

r? @varkor
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
…-0-part-2, r=Centril

Require issue = "none" over issue = "0" in unstable attributes

These changes make the use of `issue = "none"` required in unstable attributes throughout the compiler.

Notes:
- rust-lang#66299 is now in beta so `issue = "none"` is accepted.
- The `tidy` tool now fails on `issue = "0"`.
- Tests that used `issue = "0"` were changed to use `issue = "none"`, except for _one_ that asserts `issue = "0"` can still be used.
- The compiler still allows `issue = "0"` because some submodules require it, this could be disallowed once these are updated.

Resolves rust-lang#41260

r? @varkor
bors added a commit that referenced this pull request Dec 22, 2019
Rollup of 6 pull requests

Successful merges:

 - #67148 ( Refactor type & bounds parsing thoroughly)
 - #67410 (Reenable static linking of libstdc++ on windows-gnu)
 - #67439 (Cleanup `lower_pattern_unadjusted` & Improve slice pat typeck)
 - #67480 (Require issue = "none" over issue = "0" in unstable attributes)
 - #67500 (Tweak non_shorthand_field_patterns' suggestion)
 - #67504 (Warn against relying on ?Sized being last)

Failed merges:

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tidy feature: deny commits with a tracking issue of 0
6 participants