Cleanup rustc/middle #54756

ljedrz · 2018-10-02T17:00:45Z

improve allocations
use Cow<'static, str> where applicable
improve some patterns
whitespace & formatting fixes

rust-highfive · 2018-10-02T17:00:55Z

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

bors · 2018-10-03T02:16:37Z

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

rust-highfive · 2018-10-03T10:07:32Z

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.

[00:07:46] 
[00:07:46] error[E0614]: type `syntax_pos::Span` cannot be dereferenced
[00:07:46]     --> librustc/middle/resolve_lifetime.rs:1109:22
[00:07:46]      |
[00:07:46] 1109 |         ).span_label(*explicit_span, "explicit lifetime definition here")
[00:07:46] 
[00:07:54] error: aborting due to 3 previous errors
[00:07:54] 
[00:07:54] For more information about this error, try `rustc --explain E0614`.
[00:07:54] For more information about this error, try `rustc --explain E0614`.
[00:07:54] error: Could not compile `rustc`.
[00:07:54] 
[00:07:54] To learn more, run the command again with --verbose.
[00:07:54] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:07:54] expected success, got: exit code: 101
[00:07:54] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1112:9
[00:07:54] travis_fold:end:stage0-rustc

[00:07:54] travis_time:end:stage0-rustc:start=1538561089982951430,finish=1538561248173324841,duration=158190373411


[00:07:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:07:54] Build completed unsuccessfully in 0:03:31
[00:07:54] Makefile:28: recipe for target 'all' failed
[00:07:54] make: *** [all] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0b440822
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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-10-03T11:51:34Z

Rebased.

ljedrz · 2018-10-03T20:45:18Z

It seems @michaelwoerister might be currently unavailable;

r? @zackmdavis

zackmdavis · 2018-10-04T06:31:05Z

(I'll take a look Friday evening.)

michaelwoerister · 2018-10-04T10:47:35Z

src/librustc/middle/resolve_lifetime.rs

+    });
+
+    let explicit = lifetime_params.by_ref().find(|(kind, _)| *kind == LifetimeParamKind::Explicit);
+    let in_band = lifetime_params.find(|(kind, _)| *kind == LifetimeParamKind::InBand);


This looks a bit problematic. From the code it's not entirely clear if the second find will see any elements, since they might have been consumed by the first find. I'd just leave this as is.

Ah, you're right; I'll fix it shortly.

ljedrz · 2018-10-04T11:09:03Z

@michaelwoerister thanks, issue addressed.

michaelwoerister · 2018-10-04T11:49:47Z

Thanks! @bors r+

bors · 2018-10-04T11:49:48Z

📌 Commit 97d37ed8a89c40aaca429c3b73b22cae70164722 has been approved by michaelwoerister

bors · 2018-10-05T18:14:28Z

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

ljedrz · 2018-10-06T08:27:08Z

Rebased.

michaelwoerister · 2018-10-06T17:34:40Z

@bors r+

bors · 2018-10-06T17:34:41Z

📌 Commit 786b86e has been approved by michaelwoerister

bors · 2018-10-06T20:04:27Z

⌛ Testing commit 786b86e with merge 4efdc04...

Cleanup rustc/middle - improve allocations - use `Cow<'static, str>` where applicable - improve some patterns - whitespace & formatting fixes

bors · 2018-10-06T22:36:07Z

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing 4efdc04 to master...

rust-highfive assigned michaelwoerister Oct 2, 2018

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

ljedrz force-pushed the cleanup_middle branch from 4221d3e to e7b5341 Compare October 3, 2018 09:57

ljedrz force-pushed the cleanup_middle branch from e7b5341 to cd5ae94 Compare October 3, 2018 11:50

rust-highfive assigned zackmdavis and unassigned michaelwoerister Oct 3, 2018

michaelwoerister reviewed Oct 4, 2018

View reviewed changes

ljedrz force-pushed the cleanup_middle branch from cd5ae94 to 97d37ed Compare October 4, 2018 11:08

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 Oct 4, 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 Oct 5, 2018

ljedrz added 4 commits October 6, 2018 10:24

rustc/middle: improve some patterns

c2b3aa9

rustc/middle: use Cow<'static, str> where applicable

a256a66

rustc/middle: improve allocations

96736f2

rustc/middle: whitespace & formatting fixes

786b86e

ljedrz force-pushed the cleanup_middle branch from 97d37ed to 786b86e Compare October 6, 2018 08:26

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 Oct 6, 2018

bors added a commit that referenced this pull request Oct 6, 2018

Auto merge of #54756 - ljedrz:cleanup_middle, r=michaelwoerister

4efdc04

Cleanup rustc/middle - improve allocations - use `Cow<'static, str>` where applicable - improve some patterns - whitespace & formatting fixes

bors merged commit 786b86e into rust-lang:master Oct 6, 2018

ljedrz deleted the cleanup_middle branch October 7, 2018 06:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup rustc/middle #54756

Cleanup rustc/middle #54756

ljedrz commented Oct 2, 2018 •

edited

Loading

rust-highfive commented Oct 2, 2018

bors commented Oct 3, 2018

rust-highfive commented Oct 3, 2018

ljedrz commented Oct 3, 2018

ljedrz commented Oct 3, 2018 •

edited

Loading

zackmdavis commented Oct 4, 2018

michaelwoerister Oct 4, 2018

ljedrz Oct 4, 2018

ljedrz commented Oct 4, 2018

michaelwoerister commented Oct 4, 2018

bors commented Oct 4, 2018

bors commented Oct 5, 2018

ljedrz commented Oct 6, 2018

michaelwoerister commented Oct 6, 2018

bors commented Oct 6, 2018

bors commented Oct 6, 2018

bors commented Oct 6, 2018

Cleanup rustc/middle #54756

Cleanup rustc/middle #54756

Conversation

ljedrz commented Oct 2, 2018 • edited Loading

rust-highfive commented Oct 2, 2018

bors commented Oct 3, 2018

rust-highfive commented Oct 3, 2018

ljedrz commented Oct 3, 2018

ljedrz commented Oct 3, 2018 • edited Loading

zackmdavis commented Oct 4, 2018

michaelwoerister Oct 4, 2018

Choose a reason for hiding this comment

ljedrz Oct 4, 2018

Choose a reason for hiding this comment

ljedrz commented Oct 4, 2018

michaelwoerister commented Oct 4, 2018

bors commented Oct 4, 2018

bors commented Oct 5, 2018

ljedrz commented Oct 6, 2018

michaelwoerister commented Oct 6, 2018

bors commented Oct 6, 2018

bors commented Oct 6, 2018

bors commented Oct 6, 2018

ljedrz commented Oct 2, 2018 •

edited

Loading

ljedrz commented Oct 3, 2018 •

edited

Loading