Simplify use of keyword symbols #60740

petrochenkov · 2019-05-11T16:31:46Z

They mirror non-keyword symbols now (see #60630).

keywords::MyKeyword.name() -> kw::MyKeyword
keywords::MyKeyword.ident() -> Ident::with_empty_ctxt(kw::MyKeyword) (not common)
keywords::Invalid.ident() -> Ident::invalid() (more common)

Keywords are simply Symbol constants now, the Keyword struct is eliminated.
This means kw::MyKeyword can now be used in match in particular.

petrochenkov · 2019-05-11T16:31:58Z

cc @nnethercote

nnethercote · 2019-05-12T04:59:32Z

Lovely! I had considered doing this myself, but I hadn't yet worked up the energy to do so :)

bors · 2019-05-12T20:38:48Z

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

src/librustdoc/clean/mod.rs

nnethercote · 2019-05-13T00:07:58Z

@petrochenkov: r=me once the issue above is resolved satisfactorily.

petrochenkov · 2019-05-13T19:57:55Z

@bors r=nnethercote

bors · 2019-05-13T19:57:56Z

📌 Commit 261eb01 has been approved by nnethercote

bors · 2019-05-13T19:57:57Z

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

petrochenkov · 2019-05-13T19:58:22Z

@bors p=1 (conflict-prone)

bors · 2019-05-14T05:59:25Z

⌛ Testing commit 261eb01 with merge e598681d9a59feedcd638666232dcac1d8826314...

bors · 2019-05-14T08:42:32Z

💔 Test failed - checks-travis

rust-highfive · 2019-05-14T08:42:34Z

The job dist-x86_64-apple 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.

==> Auto-updated Homebrew!
Updated 1 tap (caskroom/cask).
No changes to formulae.
==> Downloading https://homebrew.bintray.com/bottles/xz-5.2.4.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/e7/e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880?__gda__=exp=1557814770~hmac=215501b9307d74b35fd94ac54d2f45e5894a73db9a000d4fad6c4f190aeb95a1&response-content-disposition=attachment%3Bfilename%3D%22xz-5.2.4.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX19RCvPcqH2qgMQzgMaoeDFru_ZOEwmw0gi01_Ofe8i80vZwAVHamYjzFniAppKhb6t8Jgmk7knuACaYAVxMMtjmipT-m4Xsq6K94_utcMkSw7hbnJBMw5lzgRMs6srCaVTub8en88KBBw&response-X-Checksum-Sha1=32dc0b28e61f32b40c20e2993418aa8cb6e746d5&response-X-Checksum-Sha2=e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880
🍺  /usr/local/Cellar/xz/5.2.4: 92 files, 1MB
==> `brew cleanup` has not been run in 30 days, running now...
Removing: /Users/travis/Library/Caches/Homebrew/boost-1.66.0.high_sierra.bottle.tar.gz... (84.6MB)
Removing: /Users/travis/Library/Caches/Homebrew/carthage-0.28.0.high_sierra.bottle.tar.gz... (8.3MB)
---
Pruned 0 symbolic links and 5 directories from /usr/local
==> Installing dependencies for swig: pcre
==> Installing swig dependency: pcre
==> Downloading https://homebrew.bintray.com/bottles/pcre-8.43.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/03/0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861?__gda__=exp=1557814781~hmac=d5e2b5ce405e9c595b44a81ed37a8be5a47e9301b159be33d9af38ce9f488959&response-content-disposition=attachment%3Bfilename%3D%22pcre-8.43.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1-zuN6zkH2L_KZ2Nip7D_Aus32N031GolM0bfLR9q7T2gtEZkj8aLneCodQkuWW_N_QZFpMkB4pCM7-dJR2MFa_JiQ_2MFrknaT0CjLZIWqZNCEUiMEP0gi2_WkfaZpb_ss7UZzqHtohg&response-X-Checksum-Sha1=c67d4b99bb245f0ea56b34118dd6325b06a7250c&response-X-Checksum-Sha2=0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861
🍺  /usr/local/Cellar/pcre/8.43: 204 files, 5.5MB
==> Installing swig
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/ae/aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7?__gda__=exp=1557814783~hmac=7a2f74c253784b1655c164fed2edb507bd15208e6abde72d7dbcda51769c29d0&response-content-disposition=attachment%3Bfilename%3D%22swig-4.0.0.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1-VqhiyjMS6HQca43PvjgCRcAlon1JgZYkYeQxPC8nWGPd9_-o2D3kONHj-LiOBv2QOXf3Fov5gWBo5TBCeOkQ4Sn0l4wHvpwNvVL6Dt0hvywmPDjD_0kVA4O9iDVF3Yx7RdbcnCXW_WA&response-X-Checksum-Sha1=a9c428aee4337d91061a69c02d7ae508b627d03f&response-X-Checksum-Sha2=aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7
🍺  /usr/local/Cellar/swig/4.0.0: 722 files, 5.4MB
travis_time:end:061bf342:start=1557813706998465000,finish=1557814100831783000,duration=393833318000
travis_fold:end:install
travis_fold:start:before_script.1
---
[00:03:21]       Memory: 8 GB
[00:03:21]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:03:21]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:21]       SMC Version (system): 2.8f0
[00:03:21]       Serial Number (system): VMqURky+qS4w
[00:03:21] 
[00:03:21] hw.ncpu: 4
[00:03:21] hw.byteorder: 1234
[00:03:21] hw.memsize: 8589934592
---
[01:27:31]    Compiling clippy_lints v0.0.212 (/Users/travis/build/rust-lang/rust/src/tools/clippy/clippy_lints)
[01:27:34] error[E0432]: unresolved import `syntax::symbol::keywords`
[01:27:34]   --> src/tools/clippy/clippy_lints/src/utils/mod.rs:45:22
[01:27:34]    |
[01:27:34] 45 | use syntax::symbol::{keywords, Symbol};
[01:27:34]    |                      ^^^^^^^^ no `keywords` in `symbol`
[01:27:34] error[E0432]: unresolved import `syntax::symbol::keywords`
[01:27:34]  --> src/tools/clippy/clippy_lints/src/lifetimes.rs:9:5
[01:27:34]   |
[01:27:34] 9 | use syntax::symbol::keywords;
---
[01:27:45] 
[01:27:45] error[E0432]: unresolved import `syntax::symbol::keywords`
[01:27:45]   --> src/tools/clippy/clippy_lints/src/utils/mod.rs:45:22
[01:27:45]    |
[01:27:45] 45 | use syntax::symbol::{keywords, Symbol};
[01:27:45]    |                      ^^^^^^^^ no `keywords` in `symbol`
[01:27:45] error[E0432]: unresolved import `syntax::symbol::keywords`
[01:27:45]  --> src/tools/clippy/clippy_lints/src/lifetimes.rs:9:5
[01:27:45]   |
[01:27:45] 9 | use syntax::symbol::keywords;
---
[01:29:04]    Compiling rayon v1.0.1
[01:29:07] error[E0432]: unresolved import `syntax::symbol::keywords`
[01:29:07]   --> src/tools/clippy/clippy_lints/src/utils/mod.rs:45:22
[01:29:07]    |
[01:29:07] 45 | use syntax::symbol::{keywords, Symbol};
[01:29:07]    |                      ^^^^^^^^ no `keywords` in `symbol`
[01:29:07] error[E0432]: unresolved import `syntax::symbol::keywords`
[01:29:07]  --> src/tools/clippy/clippy_lints/src/lifetimes.rs:9:5
[01:29:07]   |
[01:29:07] 9 | use syntax::symbol::keywords;
---
[02:23:43]    Compiling clippy_lints v0.0.212 (/Users/travis/build/rust-lang/rust/src/tools/clippy/clippy_lints)
[02:23:47] error[E0432]: unresolved import `syntax::symbol::keywords`
[02:23:47]   --> src/tools/clippy/clippy_lints/src/utils/mod.rs:45:22
[02:23:47]    |
[02:23:47] 45 | use syntax::symbol::{keywords, Symbol};
[02:23:47]    |                      ^^^^^^^^ no `keywords` in `symbol`
[02:23:47] error[E0432]: unresolved import `syntax::symbol::keywords`
[02:23:47]   --> src/tools/clippy/clippy_lints/src/utils/mod.rs:45:22
[02:23:47]    |
[02:23:47]    |
[02:23:47] 45 | use syntax::symbol::{keywords, Symbol};
[02:23:47]    |                      ^^^^^^^^ no `keywords` in `symbol`
[02:23:47] error[E0432]: unresolved import `syntax::symbol::keywords`
[02:23:47]  --> src/tools/clippy/clippy_lints/src/lifetimes.rs:9:5
[02:23:47]   |
[02:23:47] 9 | use syntax::symbol::keywords;
---
[02:24:14]    Compiling racer v2.1.22
[02:24:17] error[E0432]: unresolved import `syntax::symbol::keywords`
[02:24:17]   --> src/tools/clippy/clippy_lints/src/utils/mod.rs:45:22
[02:24:17]    |
[02:24:17] 45 | use syntax::symbol::{keywords, Symbol};
[02:24:17]    |                      ^^^^^^^^ no `keywords` in `symbol`
[02:24:17] error[E0432]: unresolved import `syntax::symbol::keywords`
[02:24:17]  --> src/tools/clippy/clippy_lints/src/lifetimes.rs:9:5
[02:24:17]   |
[02:24:17] 9 | use syntax::symbol::keywords;
---
upload: deploy/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-armv7-apple-ios.tar.xz to s3://rust-lang-ci2/rustc-builds/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-armv7-apple-ios.tar.xz
upload: deploy/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-armv7s-apple-ios.tar.gz to s3://rust-lang-ci2/rustc-builds/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-armv7s-apple-ios.tar.gz
upload: deploy/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-i386-apple-ios.tar.xz to s3://rust-lang-ci2/rustc-builds/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-i386-apple-ios.tar.xz
upload: deploy/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-x8
The job exceeded the maximum log length, and has been terminated.

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)

nnethercote · 2019-05-14T09:59:40Z

Compiling clippy_lints v0.0.212

I'm confused... I thought clippy wasn't tested by rustc's CI. E.g. #60630 would have broken clippy in similar ways to this PR, and it passed tests on CI.

mati865 · 2019-05-14T10:14:22Z

@nnethercote tools like Clippy, RLS are tested but they are allowed to fail.

Build failed because the log has grown too much:

upload: deploy/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-i386-apple-ios.tar.xz to s3://rust-lang-ci2/rustc-builds/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-i386-apple-ios.tar.xz

upload: deploy/e598681d9a59feedcd638666232dcac1d8826314/rust-analysis-nightly-x8

The job exceeded the maximum log length, and has been terminated.

BTW it could be worth to silence these warnings:
clang-7: warning: argument unused during compilation: '-static-libstdc++' [-Wunused-command-line-argument]

petrochenkov · 2019-05-14T10:40:31Z

@bors retry

bors · 2019-05-14T13:04:48Z

⌛ Testing commit 261eb01 with merge 56043b7...

Simplify use of keyword symbols They mirror non-keyword symbols now (see #60630). `keywords::MyKeyword.name()` -> `kw::MyKeyword` `keywords::MyKeyword.ident()` -> `Ident::with_empty_ctxt(kw::MyKeyword)` (not common) `keywords::Invalid.ident()` -> `Ident::invalid()` (more common) Keywords are simply `Symbol` constants now, the `Keyword` struct is eliminated. This means `kw::MyKeyword` can now be used in `match` in particular.

bors · 2019-05-14T15:58:28Z

💔 Test failed - checks-travis

bors · 2019-05-22T18:55:39Z

📌 Commit a1885cd has been approved by nnethercote

bors · 2019-05-22T18:58:25Z

🍰 Activated

bors · 2019-05-23T01:51:02Z

⌛ Testing commit a1885cd with merge 15ccaf7...

Simplify use of keyword symbols They mirror non-keyword symbols now (see #60630). `keywords::MyKeyword.name()` -> `kw::MyKeyword` `keywords::MyKeyword.ident()` -> `Ident::with_empty_ctxt(kw::MyKeyword)` (not common) `keywords::Invalid.ident()` -> `Ident::invalid()` (more common) Keywords are simply `Symbol` constants now, the `Keyword` struct is eliminated. This means `kw::MyKeyword` can now be used in `match` in particular.

bors · 2019-05-23T04:48:14Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: nnethercote
Pushing 15ccaf7 to master...

rust-highfive · 2019-05-23T04:49:18Z

📣 Toolstate changed by #60740!

Tested on commit 15ccaf7.
Direct link to PR: #60740

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @Xanewok, @rust-lang/infra).

@Manishearth

Tested on commit rust-lang/rust@15ccaf7. Direct link to PR: <rust-lang/rust#60740> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 rls on windows: test-pass → build-fail (cc @Xanewok, @rust-lang/infra). 💔 rls on linux: test-pass → build-fail (cc @Xanewok, @rust-lang/infra).

changelog: none

Rustup to rust-lang/rust#60740 rust-lang/rust#60740 changelog: none

Changes: ``` Rustup to rust-lang#60740 Lifetimes UI test cleanup tests: update needless_bool test stderr Rustup to rust-lang#60965 ```

Changes: ```` Rustup to rust-lang#61026 rustup rust-lang#60803 Rustup to rust-lang#59545 Rustup to rust-lang#60965 clippy: bump rustc_tools util version to 0.2 rustc_tools_util: fix typo in docs (readme) rustc_tool_utils: bump version to 0.2.0 update if_chain to 1.0.0 tests: update needless_bool test stderr cargo fmt Rustup to rust-lang#60740 Lifetimes UI test cleanup ````

rust-highfive assigned michaelwoerister May 11, 2019

petrochenkov added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 12, 2019

nnethercote reviewed May 13, 2019

View reviewed changes

src/librustdoc/clean/mod.rs Show resolved Hide resolved

petrochenkov force-pushed the kw branch from 454375d to 261eb01 Compare May 13, 2019 19:57

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 May 13, 2019

nnethercote mentioned this pull request May 14, 2019

Use Symbol even more #60815

Merged

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 May 14, 2019

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 May 14, 2019

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 14, 2019

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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 22, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label May 23, 2019

bors merged commit a1885cd into rust-lang:master May 23, 2019

bors mentioned this pull request May 23, 2019

[let_chains, 2/6] Introduce Let(..) in AST, remove IfLet + WhileLet and parse let chains #60861

Merged

rust-highfive mentioned this pull request May 23, 2019

rls no longer builds after rust-lang/rust#60740 #61071

Closed

This was referenced May 23, 2019

Allow attributes in formal function parameters #60669

Merged

Add outlives suggestions for some lifetime errors #58281

Merged

Remove ObsoleteInPlace #60803

Merged

syntax: Continue refactoring literals #60965

Merged

phansch added a commit to phansch/rust-clippy that referenced this pull request May 23, 2019

Rustup to rust-lang/rust#60740

635a2fa

changelog: none

phansch mentioned this pull request May 23, 2019

Rustup to https://github.com/rust-lang/rust/pull/60740 rust-lang/rust-clippy#4126

Merged

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 23, 2019

Auto merge of #4126 - phansch:rustup, r=Manishearth

b6f6218

Rustup to rust-lang/rust#60740 rust-lang/rust#60740 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 23, 2019

Auto merge of #4126 - phansch:rustup, r=Manishearth

39d1fea

Rustup to rust-lang/rust#60740 rust-lang/rust#60740 changelog: none

phansch added a commit to phansch/rust that referenced this pull request May 23, 2019

Update Clippy submodule

13b0a80

Changes: ``` Rustup to rust-lang#60740 Lifetimes UI test cleanup tests: update needless_bool test stderr Rustup to rust-lang#60965 ```

petrochenkov deleted the kw branch June 5, 2019 16:37

petrochenkov mentioned this pull request Jun 11, 2019

Separate unit tests #61739

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify use of keyword symbols #60740

Simplify use of keyword symbols #60740

petrochenkov commented May 11, 2019 •

edited

Loading

petrochenkov commented May 11, 2019

nnethercote commented May 12, 2019

bors commented May 12, 2019

nnethercote commented May 13, 2019

petrochenkov commented May 13, 2019

bors commented May 13, 2019

bors commented May 13, 2019

petrochenkov commented May 13, 2019

bors commented May 14, 2019

bors commented May 14, 2019

rust-highfive commented May 14, 2019

nnethercote commented May 14, 2019

mati865 commented May 14, 2019 •

edited

Loading

petrochenkov commented May 14, 2019

bors commented May 14, 2019

bors commented May 14, 2019

bors commented May 22, 2019

bors commented May 22, 2019

bors commented May 23, 2019

bors commented May 23, 2019

rust-highfive commented May 23, 2019

Simplify use of keyword symbols #60740

Simplify use of keyword symbols #60740

Conversation

petrochenkov commented May 11, 2019 • edited Loading

petrochenkov commented May 11, 2019

nnethercote commented May 12, 2019

bors commented May 12, 2019

nnethercote commented May 13, 2019

petrochenkov commented May 13, 2019

bors commented May 13, 2019

bors commented May 13, 2019

petrochenkov commented May 13, 2019

bors commented May 14, 2019

bors commented May 14, 2019

rust-highfive commented May 14, 2019

nnethercote commented May 14, 2019

mati865 commented May 14, 2019 • edited Loading

petrochenkov commented May 14, 2019

bors commented May 14, 2019

bors commented May 14, 2019

bors commented May 22, 2019

bors commented May 22, 2019

bors commented May 23, 2019

bors commented May 23, 2019

rust-highfive commented May 23, 2019

petrochenkov commented May 11, 2019 •

edited

Loading

mati865 commented May 14, 2019 •

edited

Loading