Generalize `async_idents` to all new keywords #53685

alexcrichton · 2018-08-24T21:31:21Z

This commit generalizes the existing async_idents lint to easily encompass
other identifiers that will be keywords in future editions. The new lint is
called keyword_idents and the old async_idents lint is registered as renamed
to this new lint.

As a proof of concept the try keyword was added to this list as it looks to be
listed as a keyword in the 2018 edition only. The await keyword was not added
as it's not listed as a keyword yet.

Closes #53077

rust-highfive · 2018-08-24T21:31:23Z

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

varkor

Looks good to me. A couple of tiny comments, but r=me after that (or immediately if this is especially time-sensitive).

varkor · 2018-08-24T22:25:26Z

src/librustc_lint/builtin.rs

Feels like this should be using Edition::Edition2018, which already implements Display.

varkor · 2018-08-24T22:26:11Z

src/test/ui/rust-2018/try-ident.fixed

You should just be able to remove this copyright header now (and with the other tests).

Ah ok, good to know for the future!

(this'll be a hard habit to shake for me...)

scottmcm · 2018-08-24T23:10:27Z

src/librustc_lint/builtin.rs

nit: "edition"

scottmcm · 2018-08-24T23:12:06Z

src/librustc_lint/builtin.rs

Was await also reserved?

It should be if it isn't already

alexcrichton · 2018-08-27T17:10:09Z

@bors: r=varkor

bors · 2018-08-27T17:10:10Z

📌 Commit 9e96419 has been approved by varkor

Generalize `async_idents` to all new keywords This commit generalizes the existing `async_idents` lint to easily encompass other identifiers that will be keywords in future editions. The new lint is called `keyword_idents` and the old `async_idents` lint is registered as renamed to this new lint. As a proof of concept the `try` keyword was added to this list as it looks to be listed as a keyword in the 2018 edition only. The `await` keyword was not added as it's not listed as a keyword yet. Closes rust-lang#53077

bors · 2018-08-29T08:31:27Z

⌛ Testing commit 9e96419 with merge 9119395c08158c67dffe36fbe0e0062c1ad577c7...

bors · 2018-08-29T08:42:15Z

💔 Test failed - status-travis

rust-highfive · 2018-08-29T08:42:17Z

The job x86_64-gnu-debug of your PR failed on Travis (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.

[00:07:07] [00:07:07] error[E0433]: failed to resolve. Use of undeclared type or module `Edition` [00:07:07] --> librustc_lint/builtin.rs:1928:30 [00:07:07] | [00:07:07] 1928 | "try" => Edition::Edition2018, [00:07:07] | ^^^^^^^ Use of undeclared type or module `Edition` [00:07:08] error: aborting due to 2 previous errors [00:07:08] [00:07:08] For more information about this error, try `rustc --explain E0433`. [00:07:08] error: Could not compile `rustc_lint`. [00:07:08] error: Could not compile `rustc_lint`. [00:07:08] [00:07:08] Caused by: [00:07:08] process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name rustc_lint librustc_lint/lib.rs --color always --error-format json --crate-type dylib --emit=dep-info,metadata -C prefer-dynamic -C opt-level=2 -C metadata=ca229e70e4528598 -C extra-filename=-ca229e70e4528598 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/release/deps --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-445c78b30a600938.rmeta --extern rustc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc-c80832497be56dad.rmeta --extern rustc_mir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_mir-d8b9538784647156.rmeta --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-62a91fdc5731dc0e.rmeta --extern syntax=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax-cb7790fd9ee13ed4.rmeta --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-6449186865dade13.rmeta -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/backtrace-sys-ee16f6821aef40e9/out -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/miniz-sys-52504d5ed57fefc2/out` (exit code: 1) [00:07:09] error: build failed [00:07:09] error: build failed [00:07:09] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json" [00:07:09] expected success, got: exit code: 101 [00:07:09] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1119:9 [00:07:09] travis_fold:end:stage0-rustc [00:07:09] travis_time:end:stage0-rustc:start=1535531902853676821,finish=1535532057503086294,duration=154649409473 --- travis_time:end:0172f4ca:start=1535532058235022235,finish=1535532058241271345,duration=6249110 travis_fold:end:after_failure.3 travis_fold:start:after_failure.4 travis_time:start:0ee0f50e $ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true travis_fold:end:after_failure.4 travis_fold:start:after_failure.5 travis_time:start:0087bb3e travis_time:start:0087bb3e $ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory travis_fold:end:after_failure.5 travis_fold:start:after_failure.6 travis_time:start:02267b18 $ dmesg | grep -i kill

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)

This commit generalizes the existing `async_idents` lint to easily encompass other identifiers that will be keywords in future editions. The new lint is called `keyword_idents` and the old `async_idents` lint is registered as renamed to this new lint. As a proof of concept the `try` keyword was added to this list as it looks to be listed as a keyword in the 2018 edition only. The `await` keyword was not added as it's not listed as a keyword yet. Closes rust-lang#53077

alexcrichton · 2018-08-29T16:35:07Z

@bors: r=varkor

bors · 2018-08-29T16:35:08Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: Avoid calling unroll_place() in a common case. #53733

bors · 2018-08-29T16:35:09Z

📌 Commit 9e96419 has been approved by varkor

alexcrichton · 2018-08-29T16:35:32Z

@bors: r=varkor

bors · 2018-08-29T16:35:34Z

📌 Commit 003cab2 has been approved by varkor

Generalize `async_idents` to all new keywords This commit generalizes the existing `async_idents` lint to easily encompass other identifiers that will be keywords in future editions. The new lint is called `keyword_idents` and the old `async_idents` lint is registered as renamed to this new lint. As a proof of concept the `try` keyword was added to this list as it looks to be listed as a keyword in the 2018 edition only. The `await` keyword was not added as it's not listed as a keyword yet. Closes rust-lang#53077

bors · 2018-08-30T03:31:48Z

⌛ Testing commit 003cab2 with merge f1a5373...

Generalize `async_idents` to all new keywords This commit generalizes the existing `async_idents` lint to easily encompass other identifiers that will be keywords in future editions. The new lint is called `keyword_idents` and the old `async_idents` lint is registered as renamed to this new lint. As a proof of concept the `try` keyword was added to this list as it looks to be listed as a keyword in the 2018 edition only. The `await` keyword was not added as it's not listed as a keyword yet. Closes #53077

bors · 2018-08-30T05:51:52Z

☀️ Test successful - status-appveyor, status-travis
Approved by: varkor
Pushing f1a5373 to master...

rust-highfive assigned varkor Aug 24, 2018

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

This was referenced Aug 24, 2018

generalize "async-idents" edition compatibility lint to other 2018 keywords #53077

Closed

Implement try block expressions #52602

Merged

varkor approved these changes Aug 24, 2018

View reviewed changes

scottmcm reviewed Aug 24, 2018

View reviewed changes

src/librustc_lint/builtin.rs Outdated

Copy link

Member

scottmcm Aug 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: "edition"

scottmcm reviewed Aug 24, 2018

View reviewed changes

alexcrichton force-pushed the more-keywords branch from cd5bbe5 to 9e96419 Compare August 27, 2018 17:09

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 Aug 27, 2018

Mark-Simulacrum mentioned this pull request Aug 28, 2018

Rollup of 19 pull requests #53775

Closed

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 Aug 29, 2018

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 Aug 29, 2018

alexcrichton force-pushed the more-keywords branch from 9e96419 to 003cab2 Compare August 29, 2018 16:35

pietroalbini mentioned this pull request Aug 29, 2018

Rollup of 21 pull requests #53798

Closed

pietroalbini mentioned this pull request Aug 29, 2018

Rollup of 20 pull requests #53799

Closed

bors merged commit 003cab2 into rust-lang:master Aug 30, 2018

alexcrichton deleted the more-keywords branch October 8, 2018 19:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Generalize `async_idents` to all new keywords #53685

Generalize `async_idents` to all new keywords #53685

Uh oh!

alexcrichton commented Aug 24, 2018

rust-highfive commented Aug 24, 2018

varkor left a comment

varkor Aug 24, 2018

varkor Aug 24, 2018

alexcrichton Aug 27, 2018

scottmcm Aug 24, 2018

scottmcm Aug 24, 2018

Centril Aug 27, 2018

alexcrichton commented Aug 27, 2018

bors commented Aug 27, 2018

bors commented Aug 29, 2018

bors commented Aug 29, 2018

rust-highfive commented Aug 29, 2018

alexcrichton commented Aug 29, 2018

bors commented Aug 29, 2018

bors commented Aug 29, 2018

alexcrichton commented Aug 29, 2018

bors commented Aug 29, 2018

bors commented Aug 30, 2018

bors commented Aug 30, 2018

Labels

6 participants

Uh oh!

Generalize async_idents to all new keywords #53685

Generalize async_idents to all new keywords #53685

Uh oh!

Conversation

alexcrichton commented Aug 24, 2018

rust-highfive commented Aug 24, 2018

varkor left a comment

Choose a reason for hiding this comment

varkor Aug 24, 2018

Choose a reason for hiding this comment

varkor Aug 24, 2018

Choose a reason for hiding this comment

alexcrichton Aug 27, 2018

Choose a reason for hiding this comment

scottmcm Aug 24, 2018

Choose a reason for hiding this comment

scottmcm Aug 24, 2018

Choose a reason for hiding this comment

Centril Aug 27, 2018

Choose a reason for hiding this comment

alexcrichton commented Aug 27, 2018

bors commented Aug 27, 2018

bors commented Aug 29, 2018

bors commented Aug 29, 2018

rust-highfive commented Aug 29, 2018

alexcrichton commented Aug 29, 2018

bors commented Aug 29, 2018

bors commented Aug 29, 2018

alexcrichton commented Aug 29, 2018

bors commented Aug 29, 2018

bors commented Aug 30, 2018

bors commented Aug 30, 2018

Labels

6 participants

Generalize `async_idents` to all new keywords #53685

Generalize `async_idents` to all new keywords #53685