Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #46029

Merged
merged 19 commits into from
Nov 16, 2017
Merged

Rollup of 6 pull requests #46029

merged 19 commits into from
Nov 16, 2017

Conversation

CrockAgile and others added 19 commits November 12, 2017 14:57
This changes macro expansion to format the path of a macro directly
instead of usng the pprust infrastructure. The pprust infrastructure
tries to perform line-breaking in a slow fashion, which is undesired
when formatting the path of a macro.

This should to speed up expansion by a fair amount (I saw 20% on a
profiler on `rustc_mir`, and 50% of the time marked as "expansion" in
the profiler/time-passes is actually spent loading dependencies).
Show both the attribute and the item
incr: Update hash tests to use `except`-style checking

Part of rust-lang#44924

r? @michaelwoerister
avoid the pprust infrastructure in macro expansion

This changes macro expansion to format the path of a macro directly
instead of usng the pprust infrastructure. The pprust infrastructure
tries to perform line-breaking in a slow fashion, which is undesired
when formatting the path of a macro.

This should to speed up expansion by a fair amount (I saw 20% on a
profiler on `rustc_mir`, and 50% of the time marked as "expansion" in
the profiler/time-passes is actually spent loading dependencies).

r? @jseyfried
Add context to E0084, E0517, E0518

A small diagnostic enhancement to get my feet wet.  Please scrutinize!

This modifies errors E0084, E0517, and E0518 to include both the annotation and the annotated item.  All of these errors already had labels; I moved the label to the other span, and rephrased it as necessary.

Fixes rust-lang#45886
examples in Cow::into_owned don't need to wrap result in Cows

This totally confused me until i triple-checked the actual return value and opened the examples in the playground myself.

r? @rust-lang/docs
rustdoc: Escape doc root URLs

This fixes a small HTML injection issue.
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Nov 16, 2017

📌 Commit d57fed8 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Nov 16, 2017

⌛ Testing commit d57fed8 with merge a6a65dd522c1d885385a14953667bb7ee1f7928a...

@bors
Copy link
Contributor

bors commented Nov 16, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Nov 16, 2017

arm-android, test_process_output_fail_to_start...

@bors retry #43283

@kennytm
Copy link
Member

kennytm commented Nov 16, 2017

@bors p=6

@bors
Copy link
Contributor

bors commented Nov 16, 2017

⌛ Testing commit d57fed8 with merge 58d8761...

bors added a commit that referenced this pull request Nov 16, 2017
Rollup of 6 pull requests

- Successful merges: #45951, #45973, #45984, #45993, #46005, #46010
- Failed merges:
@bors
Copy link
Contributor

bors commented Nov 16, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 58d8761 to master...

@bors bors merged commit d57fed8 into rust-lang:master Nov 16, 2017
@GuillaumeGomez GuillaumeGomez deleted the rollup branch November 17, 2017 13:48
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants