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

Update version of rls-data used with save-analysis #53442

Merged
merged 1 commit into from
Aug 22, 2018

Conversation

staktrace
Copy link
Contributor

This part 1/3 for fixing #53440.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cramertj (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 17, 2018
@emilio
Copy link
Contributor

emilio commented Aug 18, 2018

Could you try applying a6a6230, assuming CI is not mad about it? That was the point of my change to rls-data.

Thanks!

@emilio
Copy link
Contributor

emilio commented Aug 18, 2018

(Otherwise feel free to merge this first and I'll submit a followup with that change)

@staktrace
Copy link
Contributor Author

It's probably better to do that in a followup to avoid lumping things together. (I want this version bump for a different reason than you)

@emilio
Copy link
Contributor

emilio commented Aug 19, 2018

Fair enough, will update once that's in :)

@nrc
Copy link
Member

nrc commented Aug 21, 2018

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Aug 21, 2018

📌 Commit a50f29a has been approved by nrc

@bors 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 Aug 21, 2018
@rust-highfive rust-highfive assigned nrc and unassigned cramertj Aug 21, 2018
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 22, 2018
Update version of rls-data used with save-analysis

This part 1/3 for fixing rust-lang#53440.
bors added a commit that referenced this pull request Aug 22, 2018
Rollup of 10 pull requests

Successful merges:

 - #53418 (Mark some suggestions as MachineApplicable)
 - #53431 (Moved some feature gate ui tests to correct location)
 - #53442 (Update version of rls-data used with save-analysis)
 - #53504 (Set applicability for more suggestions.)
 - #53541 (Fix missing impl trait display as ret type)
 - #53544 (Point at the trait argument when using unboxed closure)
 - #53558 (Normalize source line and column numbers.)
 - #53562 (Lament the invincibility of the Turbofish)
 - #53574 (Suggest direct raw-pointer dereference)
 - #53585 (Remove super old comment on function that parses items)

Failed merges:

 - #53472 (Use FxHash{Map,Set} instead of the default Hash{Map,Set} everywhere in rustc.)
 - #53563 (use String::new() instead of String::from(""), "".to_string(), "".to_owned() or "".into())

r? @ghost
@bors bors merged commit a50f29a into rust-lang:master Aug 22, 2018
@staktrace staktrace deleted the rlsbump branch August 23, 2018 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants