cleanup: Remove `DefIndexAddressSpace`#60647

petrochenkov · 2019-05-08T21:10:12Z

The scheme with two address spaces for DefIndex was needed in the past, but apparently not needed anymore (after removing DefIds from locals and HirId-ification).

Mark-Simulacrum · 2019-05-08T21:20:48Z

@bors try for perf

bors · 2019-05-08T21:20:59Z

⌛ Trying commit a49aa9b with merge fe050c9...

cleanup: Remove `DefIndexAddressSpace` The scheme with two address spaces for `DefIndex` was needed in the past, but apparently not needed anymore (after removing `DefId`s from locals and `HirId`-ification).

petrochenkov · 2019-05-08T21:35:06Z

@Mark-Simulacrum
I was waiting until local testing completes, the try is probably going to fail - some tests are not updated yet.

Mark-Simulacrum · 2019-05-08T21:39:33Z

Try doesn't require tests to pass (it's purely a dist build), so we should be fine if things build.

michaelwoerister · 2019-05-09T07:52:03Z

@rust-timer build fe050c9

rust-timer · 2019-05-09T07:52:06Z

Success: Queued fe050c9 with parent e630580, comparison URL.

rust-timer · 2019-05-09T10:27:50Z

Finished benchmarking try commit fe050c9

michaelwoerister · 2019-05-09T10:53:03Z

Thank you, @petrochenkov! Good riddance :)

michaelwoerister · 2019-05-09T10:53:12Z

@bors r+

bors · 2019-05-09T10:53:13Z

📌 Commit ee6d315 has been approved by michaelwoerister

bors · 2019-05-09T10:53:25Z

⌛ Testing commit ee6d315 with merge 498d53ec9940685a18669a4ea6adddf0a34274fa...

michaelwoerister · 2019-05-09T10:57:07Z

Note, this could probably be further simplified by using newtype_index! for DefIndex and switching things to IndexVec<DefIndex, _> where appropriate. But let's land this first :)

bors · 2019-05-09T12:42:11Z

💔 Test failed - checks-travis

rust-highfive · 2019-05-09T12:42:12Z

The job arm-android 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.

[01:47:20] test string::test_str_clear ... ok
[01:47:20] test string::test_str_truncate ... ok
[01:47:20] test string::test_str_truncate_invalid_len ... ok
[01:47:20] test string::test_str_truncate_split_codepoint ... ok
[01:47:20] died due to signal 11
[01:47:20] 
[01:47:20] 
[01:47:20] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "alloc" "--"
[01:47:20] expected success, got: exit code: 3
---
travis_time:end:02951dea:start=1557405720635638569,finish=1557405720647107668,duration=11469099
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:170899cb
$ 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:15577f37
$ 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)

Mark-Simulacrum · 2019-05-09T13:16:14Z

@bors retry Android segfault

…ister cleanup: Remove `DefIndexAddressSpace` The scheme with two address spaces for `DefIndex` was needed in the past, but apparently not needed anymore (after removing `DefId`s from locals and `HirId`-ification).

@ghost

Rollup of 5 pull requests Successful merges: - #60601 (Add a `cast` method to raw pointers.) - #60638 (pin: make the to-module link more visible) - #60647 (cleanup: Remove `DefIndexAddressSpace`) - #60656 (Inline some Cursor calls for slices) - #60657 (Stabilize and re-export core::array in std) Failed merges: r? @ghost

eddyb · 2019-05-13T15:02:51Z

src/librustc/hir/map/definitions.rs

-            index_to_key,
-            def_path_hashes,
+            index_to_key: Decodable::decode(d)?,
+            def_path_hashes : Decodable::decode(d)?,


Doesn't this mean this impl can now be auto-derived? Same for encoding.

eddyb · 2019-05-13T15:08:57Z

src/librustc_metadata/index.rs

-        buf.emit_raw_bytes(&self.positions[1]);
-        LazySeq::with_position_and_length(pos as usize,
-            (self.positions[0].len() + self.positions[1].len()) / 4 + 1)
+        buf.emit_raw_bytes(&(self.positions.len() as u32 / 4).to_le_bytes());


This is unnecessary, since it indicated the split between lo/hi, which doesn't exist anymore.

michaelwoerister · 2019-05-13T15:44:19Z

@eddyb Yes, there's definitely further clean up possible now.

eddyb · 2019-05-13T16:37:11Z

@michaelwoerister I'll likely do it during the rebase of #59953.

Auto-derive Encode and Decode implementations of DefPathTable See rust-lang#60647 (comment)

rust-highfive assigned michaelwoerister May 8, 2019

petrochenkov added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 8, 2019

cleanup: Remove DefIndexAddressSpace

ee6d315

petrochenkov force-pushed the nospace branch from a49aa9b to ee6d315 Compare May 8, 2019 21:47

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

petrochenkov mentioned this pull request May 9, 2019

DefIndex can use newtype_index! #60666

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

Centril mentioned this pull request May 9, 2019

Rollup of 5 pull requests #60672

Merged

petrochenkov removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 9, 2019

bors merged commit ee6d315 into rust-lang:master May 9, 2019

eddyb reviewed May 13, 2019

View reviewed changes

eddyb mentioned this pull request May 14, 2019

rustc_metadata: replace Entry table with one table for each of its fields (AoS -> SoA). #59953

Merged

ghost mentioned this pull request May 25, 2019

Auto-derive Encode and Decode implementations of DefPathTable #61173

Merged

Centril added a commit to Centril/rust that referenced this pull request May 25, 2019

Rollup merge of rust-lang#61173 - fabric-and-ink:minor-cleanup, r=varkor

d19f11d

Auto-derive Encode and Decode implementations of DefPathTable See rust-lang#60647 (comment)

Centril added a commit to Centril/rust that referenced this pull request May 25, 2019

Rollup merge of rust-lang#61173 - fabric-and-ink:minor-cleanup, r=varkor

fdd6d0d

Auto-derive Encode and Decode implementations of DefPathTable See rust-lang#60647 (comment)

Centril added a commit to Centril/rust that referenced this pull request May 26, 2019

Rollup merge of rust-lang#61173 - fabric-and-ink:minor-cleanup, r=varkor

f530f90

Auto-derive Encode and Decode implementations of DefPathTable See rust-lang#60647 (comment)

petrochenkov deleted the nospace branch June 5, 2019 16:38

Uh oh!

Conversation

petrochenkov commented May 8, 2019

Uh oh!

Mark-Simulacrum commented May 8, 2019

Uh oh!

bors commented May 8, 2019

Uh oh!

petrochenkov commented May 8, 2019

Uh oh!

Mark-Simulacrum commented May 8, 2019

Uh oh!

michaelwoerister commented May 9, 2019

Uh oh!

rust-timer commented May 9, 2019

Uh oh!

rust-timer commented May 9, 2019

Uh oh!

michaelwoerister commented May 9, 2019

Uh oh!

michaelwoerister commented May 9, 2019

Uh oh!

bors commented May 9, 2019

Uh oh!

bors commented May 9, 2019

Uh oh!

michaelwoerister commented May 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented May 9, 2019

Uh oh!

rust-highfive commented May 9, 2019

Uh oh!

Mark-Simulacrum commented May 9, 2019

Uh oh!

eddyb May 13, 2019

Choose a reason for hiding this comment

Uh oh!

eddyb May 13, 2019

Choose a reason for hiding this comment

Uh oh!

michaelwoerister commented May 13, 2019

Uh oh!

eddyb commented May 13, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

michaelwoerister commented May 9, 2019 •

edited

Loading