SortedMap upgrades #56039

ljedrz · 2018-11-18T09:48:10Z

change the impl From<Iterator> to FromIterator
make the impls of Index and get match the ones from BTreeMap
add is_empty and contains_key
readability/whitespace fixes
add a proper Iterator implementation
impl IntoIterator for &SortedMap

These changes make SortedMap almost a drop-in replacement for BTreeMap, at least to the point it is used by rustc; what is left is Entry API that I'd like to follow this PR with, and possibly implementing ParallelIterator.

rust-highfive · 2018-11-18T09:48:13Z

r? @estebank

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

src/librustc_data_structures/sorted_map.rs

ljedrz · 2018-11-18T19:30:21Z

Whoops, I made a mistake while salvaging the Iterator implementation from my experimental hybrid branch; I'll update once more in a few minutes ^^.

src/librustc_data_structures/sorted_map.rs

rust-highfive · 2018-11-18T21:16:29Z

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:08e27446:start=1542570299639718729,finish=1542570301793634430,duration=2153915701
$ 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
---
[00:51:02] .................................................................................................... 100/5022
[00:51:05] .................................................................................................... 200/5022
[00:51:08] .............................ii............................................ii...................ii.. 300/5022
[00:51:11] ..............................................................................................iii... 400/5022
[00:51:14] .....iiiiiiii.iii............................iii...........................................i........ 500/5022
[00:51:21] .................................................................................................... 700/5022
[00:51:27] .................................................................................i...........i...... 800/5022
[00:51:30] .................................................................................................... 900/5022
[00:51:30] .................................................................................................... 900/5022
[00:51:34] .iiiii..................iiiiii...................................................................... 1000/5022
[00:51:36] ...........................................................................iiiiiiii................. 1100/5022
[00:51:41] .................................................................................................... 1300/5022
[00:51:43] .................................................................................................... 1400/5022
[00:51:45] ................................i................................................................... 1500/5022
[00:51:48] .i.........ii.........................................................i............................. 1600/5022
---
[00:52:09] .................................................................................................... 2200/5022
[00:52:13] .................................................................................................... 2300/5022
[00:52:17] .................................................................................................... 2400/5022
[00:52:21] .................................................................................................... 2500/5022
[00:52:24] .................................................................................iiiiiiiii.......... 2600/5022
[00:52:31] ...............................................ii................................................... 2800/5022
[00:52:34] .................................................................................................... 2900/5022
[00:52:38] .................................................................................................... 3000/5022
[00:52:41] ..........................................i......................................................... 3100/5022
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:06:13] 
[01:06:13] running 116 tests
[01:06:16] i..ii...iii...iiii....i...i.........i..iii...........i.....i.....ii...i..i.ii..............i...ii..i 100/116
[01:06:16] i.i....iiii.....
[01:06:16] 
[01:06:16]  finished in 3.462
[01:06:16] travis_fold:end:test_codegen

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:06:30] 
[01:06:30] running 118 tests
[01:06:58] .iiiii...i.....i..i...i..i.i..i.i..i.....i..i....i..........iiii.........i.i....i...i.......ii.i.i.i 100/118
[01:07:02] ......iii.i.....ii
[01:07:02] 
[01:07:02]  finished in 31.792
[01:07:02] travis_fold:end:test_debuginfo

---
[01:31:07] travis_fold:start:test_stage1-rustc_data_structures
travis_time:start:test_stage1-rustc_data_structures
Testing rustc_data_structures stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:31:07]    Compiling rustc_data_structures v0.0.0 (/checkout/src/librustc_data_structures)
[01:31:10] error[E0271]: type mismatch resolving `<sorted_map::Iter<'_, _, _> as std::iter::Iterator>::Item == &_`
[01:31:10]    --> librustc_data_structures/sorted_map.rs:350:35
[01:31:10]     |
[01:31:10] 350 |             assert_eq!(map.iter().cloned().collect::<Vec<_>>(), expected);
[01:31:10]     |                                   ^^^^^^ expected tuple, found reference
[01:31:10]     |
[01:31:10]     = note: expected type `(&_, &_)`
[01:31:10] 
[01:31:10] 
[01:31:10] error[E0599]: no method named `collect` found for type `std::iter::Cloned<sorted_map::Iter<'_, _, _>>` in the current scope
[01:31:10]    --> librustc_data_structures/sorted_map.rs:350:44
[01:31:10]     |
[01:31:10] 350 |             assert_eq!(map.iter().cloned().collect::<Vec<_>>(), expected);
[01:31:10]     |
[01:31:10]     = note: the method `collect` exists but the following trait bounds were not satisfied:
[01:31:10]     = note: the method `collect` exists but the following trait bounds were not satisfied:
[01:31:10]             `std::iter::Cloned<sorted_map::Iter<'_, _, _>> : std::iter::Iterator`
[01:31:10]             `&mut std::iter::Cloned<sorted_map::Iter<'_, _, _>> : std::iter::Iterator`
[01:31:10] 
[01:31:10] error[E0271]: type mismatch resolving `<sorted_map::Iter<'_, {integer}, {integer}> as std::iter::Iterator>::Item == &_`
[01:31:10]    --> librustc_data_structures/sorted_map.rs:478:35
[01:31:10]     |
[01:31:10] 478 |             assert_eq!(map.iter().cloned().collect::<Vec<_>>(), expected);
[01:31:10]     |                                   ^^^^^^ expected tuple, found reference
[01:31:10]     |
[01:31:10]     = note: expected type `(&{integer}, &{integer})`
[01:31:10] 
[01:31:10] 
[01:31:10] error[E0599]: no method named `collect` found for type `std::iter::Cloned<sorted_map::Iter<'_, {integer}, {integer}>>` in the current scope
[01:31:10]    --> librustc_data_structures/sorted_map.rs:478:44
[01:31:10]     |
[01:31:10] 478 |             assert_eq!(map.iter().cloned().collect::<Vec<_>>(), expected);
[01:31:10]     |
[01:31:10]     = note: the method `collect` exists but the following trait bounds were not satisfied:
[01:31:10]     = note: the method `collect` exists but the following trait bounds were not satisfied:
[01:31:10]             `std::iter::Cloned<sorted_map::Iter<'_, {integer}, {integer}>> : std::iter::Iterator`
[01:31:10]             `&mut std::iter::Cloned<sorted_map::Iter<'_, {integer}, {integer}>> : std::iter::Iterator`
[01:31:10] error: aborting due to 4 previous errors
[01:31:10] 
[01:31:10] Some errors occurred: E0271, E0599.
[01:31:10] For more information about an error, try `rustc --explain E0271`.
[01:31:10] For more information about an error, try `rustc --explain E0271`.
[01:31:10] error: Could not compile `rustc_data_structures`.
[01:31:10] 
[01:31:10] To learn more, run the command again with --verbose.
[01:31:10] 
[01:31:10] 
[01:31:10] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "rustc_data_structures" "--" "--quiet"
[01:31:10] 
[01:31:10] 
[01:31:10] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:31:10] Build completed unsuccessfully in 0:43:52
[01:31:10] Build completed unsuccessfully in 0:43:52
[01:31:10] Makefile:58: recipe for target 'check' failed
[01:31:10] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0c73445e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Nov 18 21:16:22 UTC 2018
---
travis_time:end:32e57d09:start=1542575786097449101,finish=1542575786286473907,duration=189024806
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:37265737
$ 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:0c07349c
$ 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)

ljedrz · 2018-11-19T20:01:11Z

It appears @estebank might currently be unavailable .

r? @matthewjasper

ljedrz · 2018-11-19T20:03:10Z

(I'm waiting with a fix until the iterator approach is decided)

TimNN · 2018-11-27T18:22:19Z

Ping from triage @matthewjasper / @ljedrz: What is the status of this PR?

(I'm waiting with a fix until the iterator approach is decided)

Does that refer to the inline discussion with @bluss?

ljedrz · 2018-11-27T20:59:17Z

@TimNN Yes, I would like to hear some feedback on compatibility vs. simplicity in the implementation of Iterator for SortedMap.

Dylan-DPC-zz · 2018-12-10T09:44:28Z

ping from triage @ljedrz @bluss @matthewjasper what's the update on this?

ljedrz · 2018-12-10T13:26:09Z

@Dylan-DPC I decided to keep the bits that add new functionalities and improve compatibility with BTreeMap without introducing new wrappers. These should be innocuous enough for a good start 👌.

r? @matthewjasper

matthewjasper · 2018-12-11T19:52:41Z

@bors r+

bors · 2018-12-11T19:52:42Z

📌 Commit 5b6401f has been approved by matthewjasper

bors · 2018-12-11T23:30:17Z

⌛ Testing commit 5b6401f with merge c7806890dcc8a4fa868502393e166b744f86f18a...

bors · 2018-12-11T23:32:06Z

💔 Test failed - status-appveyor

rust-highfive · 2018-12-11T23:34:08Z

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.

Checking out files: 100% (17616/17616), done.
travis_time:end:18f4ec2e:start=1544571141212811000,finish=1544571150738580000,duration=9525769000
$ cd rust-lang/rust
$ git checkout -qf c7806890dcc8a4fa868502393e166b744f86f18a
fatal: reference is not a tree: c7806890dcc8a4fa868502393e166b744f86f18a
The command "git checkout -qf c7806890dcc8a4fa868502393e166b744f86f18a" failed and exited with 128 during .
Your build has been stopped.

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)

alexcrichton · 2018-12-11T23:47:46Z

@bors: retry

CI automation hiccup

bors · 2018-12-12T00:23:34Z

⌛ Testing commit 5b6401f with merge 90d5a2913a62e1b34db0df4c95c8b90b351e30c6...

bors · 2018-12-12T00:31:28Z

💔 Test failed - status-appveyor

alexcrichton · 2018-12-12T01:13:18Z

@bors: retry

bors · 2018-12-12T10:44:39Z

⌛ Testing commit 5b6401f with merge ae3833d...

SortedMap upgrades - change the impl `From<Iterator>` to `FromIterator` - make the impls of `Index` and `get` match the ones from `BTreeMap` - add `is_empty` and `contains_key` - readability/whitespace fixes - add a proper `Iterator` implementation - `impl IntoIterator for &SortedMap` These changes make `SortedMap` almost a drop-in replacement for `BTreeMap`, at least to the point it is used by `rustc`; what is left is `Entry` API that I'd like to follow this PR with, and possibly implementing `ParallelIterator`.

bors · 2018-12-12T13:05:53Z

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

leonardo-m · 2018-12-13T03:25:30Z

should SortedMap.is_empty() just call self.data.is_empty()?

ljedrz · 2018-12-13T07:49:31Z

@leonardo-m I guess it would be a bit more direct, but since both SortedMap::{is_empty, len} are inlined I don't think it would make a difference.

rust-highfive assigned estebank Nov 18, 2018

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

bluss reviewed Nov 18, 2018

View reviewed changes

src/librustc_data_structures/sorted_map.rs Outdated Show resolved Hide resolved

ljedrz force-pushed the sorted_map_upgrades branch 3 times, most recently from ef967be to 9a402f4 Compare November 18, 2018 18:44

ljedrz force-pushed the sorted_map_upgrades branch from 9a402f4 to f552f31 Compare November 18, 2018 19:43

bluss reviewed Nov 18, 2018

View reviewed changes

src/librustc_data_structures/sorted_map.rs Outdated Show resolved Hide resolved

rust-highfive assigned matthewjasper and unassigned estebank Nov 19, 2018

ljedrz added 5 commits December 10, 2018 14:03

sorted_map: change From<Iterator> to FromIterator

875ce5f

sorted_map: make the impls of Index and get match ones from BTreeMap

61de47d

sorted_map: add is_empty

eb77204

sorted_map: readability/whitespace fixes

08c6bda

sorted_map: add contains_key function

5b6401f

ljedrz force-pushed the sorted_map_upgrades branch from f552f31 to 5b6401f Compare December 10, 2018 13: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 Dec 11, 2018

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 Dec 11, 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 Dec 11, 2018

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 Dec 12, 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 Dec 12, 2018

bors merged commit 5b6401f into rust-lang:master Dec 12, 2018

ljedrz deleted the sorted_map_upgrades branch December 12, 2018 13:07

SimonSapin mentioned this pull request Dec 27, 2018

Call poly_project_and_unify_type on types that contain inference types #56838

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SortedMap upgrades #56039

SortedMap upgrades #56039

ljedrz commented Nov 18, 2018 •

edited

Loading

rust-highfive commented Nov 18, 2018

ljedrz commented Nov 18, 2018

rust-highfive commented Nov 18, 2018

ljedrz commented Nov 19, 2018

ljedrz commented Nov 19, 2018

TimNN commented Nov 27, 2018

ljedrz commented Nov 27, 2018

Dylan-DPC-zz commented Dec 10, 2018

ljedrz commented Dec 10, 2018

matthewjasper commented Dec 11, 2018

bors commented Dec 11, 2018

bors commented Dec 11, 2018

bors commented Dec 11, 2018

rust-highfive commented Dec 11, 2018

alexcrichton commented Dec 11, 2018

bors commented Dec 12, 2018

bors commented Dec 12, 2018

alexcrichton commented Dec 12, 2018

bors commented Dec 12, 2018

bors commented Dec 12, 2018

leonardo-m commented Dec 13, 2018

ljedrz commented Dec 13, 2018

SortedMap upgrades #56039

SortedMap upgrades #56039

Conversation

ljedrz commented Nov 18, 2018 • edited Loading

rust-highfive commented Nov 18, 2018

ljedrz commented Nov 18, 2018

rust-highfive commented Nov 18, 2018

ljedrz commented Nov 19, 2018

ljedrz commented Nov 19, 2018

TimNN commented Nov 27, 2018

ljedrz commented Nov 27, 2018

Dylan-DPC-zz commented Dec 10, 2018

ljedrz commented Dec 10, 2018

matthewjasper commented Dec 11, 2018

bors commented Dec 11, 2018

bors commented Dec 11, 2018

bors commented Dec 11, 2018

rust-highfive commented Dec 11, 2018

alexcrichton commented Dec 11, 2018

bors commented Dec 12, 2018

bors commented Dec 12, 2018

alexcrichton commented Dec 12, 2018

bors commented Dec 12, 2018

bors commented Dec 12, 2018

leonardo-m commented Dec 13, 2018

ljedrz commented Dec 13, 2018

ljedrz commented Nov 18, 2018 •

edited

Loading