rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns. #52591

eddyb · 2018-07-21T19:16:00Z

These are cruft left over from a time when Foo::default() didn't "just work".

rust-highfive · 2018-07-21T19:16:03Z

r? @petrochenkov

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

eddyb · 2018-07-21T19:16:35Z

cc @oli-obk @Manishearth Heads up, I believe there's a use of NodeSet() in clippy.

petrochenkov · 2018-07-21T19:30:07Z

@bors r+

bors · 2018-07-21T19:30:08Z

📌 Commit 069e63d68d6eef88a23e5fe29053e9e19a6acc72 has been approved by petrochenkov

oli-obk

address.or_else(open_easy_issue)

oli-obk · 2018-07-21T20:16:57Z

src/librustc/dep_graph/graph.rs

@@ -100,11 +100,11 @@ impl DepGraph {
        DepGraph {
            data: Some(Lrc::new(DepGraphData {
                previous_work_products: prev_work_products,
-                dep_node_debug: Lock::new(FxHashMap()),
+                dep_node_debug: Lock::new(FxHashMap::default()),


Lock::default() should probably work

oli-obk · 2018-07-21T20:17:45Z

src/librustc/hir/map/definitions.rs

@@ -386,13 +386,13 @@ impl Definitions {
                index_to_key: [vec![], vec![]],
                def_path_hashes: [vec![], vec![]],
            },
-            node_to_def_index: NodeMap(),
+            node_to_def_index: NodeMap::default(),


We can replace this entire function by adding derive(Default)

oli-obk · 2018-07-21T20:18:05Z

src/librustc/ich/hcx.rs

@@ -370,7 +370,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for Span {
            // recursing every time.
            thread_local! {
                static CACHE: RefCell<FxHashMap<hygiene::Mark, u64>> =
-                    RefCell::new(FxHashMap());
+                    RefCell::new(FxHashMap::default());


RefCell::default()

oli-obk · 2018-07-21T20:18:55Z

src/librustc/infer/region_constraints/mod.rs

@@ -280,8 +280,8 @@ impl<'tcx> RegionConstraintCollector<'tcx> {
        RegionConstraintCollector {


RegionConstraintCollector::default()

oli-obk · 2018-07-21T20:19:50Z

src/librustc/lint/mod.rs

@@ -466,7 +466,7 @@ pub struct LintBuffer {

 impl LintBuffer {


Can have a derive(Default) now

src/librustdoc/clean/auto_trait.rs

@@ -852,7 +852,7 @@ impl<'a, 'tcx, 'rcx> AutoTraitFinder<'a, 'tcx, 'rcx> {
                                    // loop
                                    ty_to_traits
                                        .entry(*ty.clone())
-                                        .or_insert_with(|| FxHashSet())
+                                        .or_insert_with(|| FxHashSet::default())


oli-obk · 2018-07-21T20:38:32Z

src/librustdoc/clean/inline.rs

@@ -403,7 +403,7 @@ pub fn build_impl(cx: &DocContext, did: DefId, ret: &mut Vec<clean::Item>) {
           .into_iter()
           .map(|meth| meth.ident.to_string())
           .collect()
-    }).unwrap_or(FxHashSet());
+    }).unwrap_or(FxHashSet::default());


unwrap_or_default

oli-obk · 2018-07-21T20:38:47Z

src/librustdoc/clean/mod.rs

@@ -3879,7 +3879,7 @@ impl Clean<Vec<Item>> for doctree::Impl {
                  .into_iter()
                  .map(|meth| meth.ident.to_string())
                  .collect()
-        }).unwrap_or(FxHashSet());
+        }).unwrap_or(FxHashSet::default());


unwrap_or_default

oli-obk · 2018-07-21T20:39:34Z

src/libsyntax/codemap.rs

@@ -145,7 +145,7 @@ impl CodeMap {
        CodeMap {
            files: Lock::new(CodeMapFiles {


Lock::default()

oli-obk · 2018-07-21T20:39:43Z

src/libsyntax/codemap.rs

@@ -168,7 +168,7 @@ impl CodeMap {
        CodeMap {
            files: Lock::new(CodeMapFiles {


Lock::default()

bors · 2018-07-21T23:07:06Z

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

petrochenkov · 2018-07-23T11:01:53Z

r? @oli-obk

oli-obk · 2018-07-25T12:56:58Z

@bors r+ p=1 (prio due to bitrottyness)

bors · 2018-07-25T12:56:59Z

📌 Commit de114a7a3e2b39a8607142f11ece9e2014d3bafe has been approved by oli-obk

oli-obk · 2018-07-25T12:58:09Z

@bors r- eddyb is checking things

rust-highfive · 2018-11-21T07:05:22Z

The job x86_64-gnu-llvm-5.0 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.

travis_time:end:06fd1ad5:start=1542780799808020677,finish=1542780800920154034,duration=1112133357
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0

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 · 2018-11-21T07:14:09Z

💔 Test failed - status-travis

rust-highfive · 2018-11-21T07:14:10Z

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.

$ sudo service docker start
start: Job is already running: docker
travis_time:end:18a52a9f:start=1542782524006748123,finish=1542782524022776121,duration=16027998

No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build 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)

eddyb · 2018-11-21T07:16:21Z

Timeout? Could it be my fault?

@bors retry

bors · 2018-11-21T08:08:22Z

⌛ Testing commit 7683180 with merge 289ad6e...

rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns. These are cruft left over from a time when `Foo::default()` didn't "just work".

bors · 2018-11-21T10:59:22Z

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 289ad6e to master...

rust-highfive · 2018-11-21T11:00:42Z

📣 Toolstate changed by #52591!

Tested on commit 289ad6e.
Direct link to PR: #52591

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

@Manishearth

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

3441: rustup rust-lang/rust#52591 r=flip1995 a=matthiaskrgr Co-authored-by: Matthias Krüger <[email protected]>

```` rustup rust-lang#52591 remove unused allow() attributes, NFC Add regression test Don't emit suggestion when inside of a macro ````

submodules: update clippy from f5d868c to 70ca052 ```` rustup #52591 remove unused allow() attributes, NFC Add regression test Don't emit suggestion when inside of a macro ```` fixes clippy toolstate

```` missed another one in the README run "util/dev update_lints" rust-lang-nursery/rust-clippy => rust-lang/rust-clippy Address 'clippy::single-match' dogfood lint Fix nit Address travis CI lint failure Update trivially_copy_pass_by_ref with Trait stderr output issue#3318 run trivially_copy_pass_by_ref for traits Update trivially_copy_pass_by_ref with Trait examples Fix awkward wording Document how to lint local Clippy changes with locally built Clippy Enable rustup clippy to refer to the correct documentation rustup rust-lang#52591 remove unused allow() attributes, NFC Add regression test Don't emit suggestion when inside of a macro ````

submodules: update clippy from f5d868c to 2f6881c Changes: ```` missed another one in the README run "util/dev update_lints" rust-lang-nursery/rust-clippy => rust-lang/rust-clippy Address 'clippy::single-match' dogfood lint Fix nit Address travis CI lint failure Update trivially_copy_pass_by_ref with Trait stderr output issue#3318 run trivially_copy_pass_by_ref for traits Update trivially_copy_pass_by_ref with Trait examples Fix awkward wording Document how to lint local Clippy changes with locally built Clippy Enable rustup clippy to refer to the correct documentation rustup #52591 remove unused allow() attributes, NFC Add regression test Don't emit suggestion when inside of a macro ```` fixes clippy toolstate

crlf0710 · 2020-03-29T09:50:28Z

@rustbot modify labels to -S-inactive-closed

```` missed another one in the README run "util/dev update_lints" rust-lang-nursery/rust-clippy => rust-lang/rust-clippy Address 'clippy::single-match' dogfood lint Fix nit Address travis CI lint failure Update trivially_copy_pass_by_ref with Trait stderr output issue#3318 run trivially_copy_pass_by_ref for traits Update trivially_copy_pass_by_ref with Trait examples Fix awkward wording Document how to lint local Clippy changes with locally built Clippy Enable rustup clippy to refer to the correct documentation rustup rust-lang/rust#52591 remove unused allow() attributes, NFC Add regression test Don't emit suggestion when inside of a macro ````

rust-highfive assigned petrochenkov Jul 21, 2018

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

eddyb force-pushed the functional-snakes branch from a73b8ed to 069e63d Compare July 21, 2018 19:23

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 Jul 21, 2018

This comment has been minimized.

Sign in to view

eddyb force-pushed the functional-snakes branch from 069e63d to 44cd024 Compare July 21, 2018 19:47

This comment has been minimized.

Sign in to view

eddyb force-pushed the functional-snakes branch from 44cd024 to 81277f8 Compare July 21, 2018 20:07

This comment has been minimized.

Sign in to view

oli-obk approved these changes Jul 21, 2018

View reviewed changes

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 Jul 21, 2018

rust-highfive assigned oli-obk and unassigned petrochenkov Jul 23, 2018

eddyb force-pushed the functional-snakes branch from 81277f8 to de114a7 Compare July 25, 2018 12:53

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 Jul 25, 2018

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 Jul 25, 2018

eddyb force-pushed the functional-snakes branch from de114a7 to fc15544 Compare July 25, 2018 13:00

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 Nov 21, 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 Nov 21, 2018

bors added a commit that referenced this pull request Nov 21, 2018

Auto merge of #52591 - eddyb:functional-snakes, r=oli-obk

289ad6e

rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns. These are cruft left over from a time when `Foo::default()` didn't "just work".

bors merged commit 7683180 into rust-lang:master Nov 21, 2018

bors mentioned this pull request Nov 21, 2018

Clean up and streamline snapshot data structures #55906

Merged

eddyb deleted the functional-snakes branch November 21, 2018 11:01

This was referenced Nov 21, 2018

Universes #55517

Merged

Check arg/ret sizedness at ExprKind::Path #56045

Merged

Move Cargo.{toml,lock} to the repository root directory. #53586

Merged

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Nov 21, 2018

rustup rust-lang/rust#52591

4aae764

bors bot added a commit to rust-lang/rust-clippy that referenced this pull request Nov 21, 2018

Merge #3441

70ca052

3441: rustup rust-lang/rust#52591 r=flip1995 a=matthiaskrgr Co-authored-by: Matthias Krüger <[email protected]>

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 21, 2018

submodules: update clippy from f5d868c to 70ca052

60fe712

```` rustup rust-lang#52591 remove unused allow() attributes, NFC Add regression test Don't emit suggestion when inside of a macro ````

rustbot removed the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Mar 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns. #52591

rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns. #52591

eddyb commented Jul 21, 2018 •

edited

Loading

rust-highfive commented Jul 21, 2018

eddyb commented Jul 21, 2018

petrochenkov commented Jul 21, 2018

bors commented Jul 21, 2018

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

oli-obk left a comment

oli-obk Jul 21, 2018

oli-obk Jul 21, 2018

oli-obk Jul 21, 2018

oli-obk Jul 21, 2018

oli-obk Jul 21, 2018

This comment was marked as off-topic.

oli-obk Jul 21, 2018

oli-obk Jul 21, 2018

oli-obk Jul 21, 2018

oli-obk Jul 21, 2018

bors commented Jul 21, 2018

petrochenkov commented Jul 23, 2018

oli-obk commented Jul 25, 2018

bors commented Jul 25, 2018

oli-obk commented Jul 25, 2018

rust-highfive commented Nov 21, 2018

bors commented Nov 21, 2018

rust-highfive commented Nov 21, 2018

eddyb commented Nov 21, 2018

bors commented Nov 21, 2018

bors commented Nov 21, 2018

rust-highfive commented Nov 21, 2018

crlf0710 commented Mar 29, 2020

		@@ -280,8 +280,8 @@ impl<'tcx> RegionConstraintCollector<'tcx> {
		RegionConstraintCollector {

		@@ -466,7 +466,7 @@ pub struct LintBuffer {

		impl LintBuffer {

		@@ -145,7 +145,7 @@ impl CodeMap {
		CodeMap {
		files: Lock::new(CodeMapFiles {

		@@ -168,7 +168,7 @@ impl CodeMap {
		CodeMap {
		files: Lock::new(CodeMapFiles {

rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns. #52591

rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns. #52591

Conversation

eddyb commented Jul 21, 2018 • edited Loading

rust-highfive commented Jul 21, 2018

eddyb commented Jul 21, 2018

petrochenkov commented Jul 21, 2018

bors commented Jul 21, 2018

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

oli-obk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jul 21, 2018

petrochenkov commented Jul 23, 2018

oli-obk commented Jul 25, 2018

bors commented Jul 25, 2018

oli-obk commented Jul 25, 2018

rust-highfive commented Nov 21, 2018

bors commented Nov 21, 2018

rust-highfive commented Nov 21, 2018

eddyb commented Nov 21, 2018

bors commented Nov 21, 2018

bors commented Nov 21, 2018

rust-highfive commented Nov 21, 2018

crlf0710 commented Mar 29, 2020

eddyb commented Jul 21, 2018 •

edited

Loading