Make double ended searchers use dependent fingers#47208

Manishearth · 2018-01-05T05:42:27Z

(fixes #47175)

r? @BurntSushi @alexcrichton

needs uplift to beta

kennytm · 2018-01-05T07:40:16Z

src/libcore/str/pattern.rs

[00:03:59] tidy error: /checkout/src/libcore/str/pattern.rs:307: line longer than 100 chars

kennytm · 2018-01-05T08:59:27Z

Please revert the clippy submodule update.

[00:01:29] error: the lock file needs to be updated but --locked was passed to prevent this
[00:01:29] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:29] Build completed unsuccessfully in 0:00:00
[00:01:29] make: *** [prepare] Error 1
[00:01:29] Makefile:76: recipe for target 'prepare' failed
[00:01:29] The command has failed after 5 attempts.

Manishearth · 2018-01-05T09:55:44Z

done.

pnkfelix · 2018-01-05T10:21:57Z

src/libcore/str/pattern.rs

nit: missing space after the = in if let Some(slice) =self.haystack.as_bytes()

pnkfelix · 2018-01-05T10:36:04Z

@bors r+

bors · 2018-01-05T10:36:05Z

📌 Commit a50b2f1 has been approved by pnkfelix

kennytm · 2018-01-05T14:34:41Z

@bors r-

A new test failed.

[01:14:17] failures:
[01:14:17] 
[01:14:17] ---- pattern::double_ended_regression_test stdout ----
[01:14:17] 	thread 'pattern::double_ended_regression_test' panicked at 'assertion failed: `(left == right)`
[01:14:17]   left: `[InRange(0, 1), Done, Done, Done]`,
[01:14:17]  right: `[InRange(0, 1), InRange(10, 11), InRange(5, 6), Done]`: alternating double ended search', /checkout/src/libcore/../libcore/tests/pattern.rs:270:5
[01:14:17] 
[01:14:17] 
[01:14:17] failures:
[01:14:17]     pattern::double_ended_regression_test
[01:14:17] 
[01:14:17] test result: FAILED. 704 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

Manishearth · 2018-01-05T17:05:46Z

This is weird, the tests worked fine locally. Perhaps something changed with the merge commit?

Manishearth · 2018-01-06T05:44:58Z

lol so it turns out if you write a crate using #[test], cargo test followed by cargo +otherrustc test will not recompile the tests even though the compiler changed.

Found the bug though.

…lang#47175)

Manishearth · 2018-01-06T06:23:20Z

Should work now, I forgot to add self.finger to index in the reverse iterator.

Manishearth · 2018-01-06T06:23:25Z

r? @pnkfelix

Manishearth · 2018-01-08T07:23:45Z

Tests pass.

pnkfelix · 2018-01-08T11:03:57Z

@bors r+

bors · 2018-01-08T11:03:58Z

📌 Commit 9066219 has been approved by pnkfelix

kennytm · 2018-01-08T14:18:18Z

@bors p=2

bors · 2018-01-08T14:32:32Z

⌛ Testing commit 9066219 with merge b5392f5...

@BurntSushi

Make double ended searchers use dependent fingers (fixes #47175) r? @BurntSushi @alexcrichton needs uplift to beta

bors · 2018-01-08T17:26:00Z

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

Manishearth · 2018-01-09T08:08:49Z

needs uplift

pnkfelix · 2018-01-10T13:06:29Z

(nominating just to ensure libs team looks at the beta-nomination.)

alexcrichton · 2018-01-10T15:38:44Z

Tagging as accepted since this fixes a regression

[beta] Backports Cherry-picked (cleanly) into beta: - #46916 - #47161 - #47208 - #47269

rust-highfive assigned BurntSushi Jan 5, 2018

Manishearth mentioned this pull request Jan 5, 2018

Memory corruption (?) from tower-grpc-build on nightly #47175

Closed

eddyb added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 5, 2018

kennytm reviewed Jan 5, 2018

View reviewed changes

src/libcore/str/pattern.rs Outdated

Copy link

Member

kennytm Jan 5, 2018

Choose a reason for hiding this comment

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

[00:03:59] tidy error: /checkout/src/libcore/str/pattern.rs:307: line longer than 100 chars

kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 5, 2018

Manishearth force-pushed the double-ended-searcher branch from 4c99f48 to 1760240 Compare January 5, 2018 08:01

Manishearth force-pushed the double-ended-searcher branch from 1760240 to 85aab3f Compare January 5, 2018 09:55

pnkfelix reviewed Jan 5, 2018

View reviewed changes

Manishearth force-pushed the double-ended-searcher branch from 85aab3f to a50b2f1 Compare January 5, 2018 10:27

pnkfelix 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 Jan 5, 2018

kennytm 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 Jan 5, 2018

Manishearth added 2 commits January 6, 2018 11:17

Make double ended string searchers use dependent fingers (fixes rust-…

ff55725

…lang#47175)

Regression tests for rust-lang#47175

9066219

Manishearth force-pushed the double-ended-searcher branch from a50b2f1 to 9066219 Compare January 6, 2018 05:47

rust-highfive assigned pnkfelix and unassigned BurntSushi Jan 6, 2018

kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 6, 2018

pnkfelix 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 Jan 8, 2018

bors added a commit that referenced this pull request Jan 8, 2018

Auto merge of #47208 - Manishearth:double-ended-searcher, r=pnkfelix

b5392f5

Make double ended searchers use dependent fingers (fixes #47175) r? @BurntSushi @alexcrichton needs uplift to beta

bors merged commit 9066219 into rust-lang:master Jan 8, 2018

Manishearth deleted the double-ended-searcher branch January 9, 2018 08:08

pnkfelix added the I-nominated label Jan 10, 2018

alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed I-nominated labels Jan 10, 2018

MaloJaffre mentioned this pull request Jan 10, 2018

[beta] Backports #47327

Merged

bors added a commit that referenced this pull request Jan 10, 2018

Auto merge of #47327 - MaloJaffre:beta-backport, r=Mark-Simulacrum

a19122c

[beta] Backports Cherry-picked (cleanly) into beta: - #46916 - #47161 - #47208 - #47269

alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 11, 2018

Uh oh!

Conversation

Manishearth commented Jan 5, 2018

Uh oh!

kennytm Jan 5, 2018

Choose a reason for hiding this comment

Uh oh!

kennytm commented Jan 5, 2018

Uh oh!

Manishearth commented Jan 5, 2018

Uh oh!

pnkfelix Jan 5, 2018

Choose a reason for hiding this comment

Uh oh!

Manishearth Jan 5, 2018

Choose a reason for hiding this comment

Uh oh!

pnkfelix commented Jan 5, 2018

Uh oh!

bors commented Jan 5, 2018

Uh oh!

kennytm commented Jan 5, 2018

Uh oh!

Manishearth commented Jan 5, 2018

Uh oh!

Manishearth commented Jan 6, 2018

Uh oh!

Manishearth commented Jan 6, 2018

Uh oh!

Manishearth commented Jan 6, 2018

Uh oh!

Manishearth commented Jan 8, 2018

Uh oh!

pnkfelix commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

kennytm commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

Manishearth commented Jan 9, 2018

Uh oh!

pnkfelix commented Jan 10, 2018

Uh oh!

alexcrichton commented Jan 10, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants