Skip to content

/rust

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

Beta backports #38872

Merged
merged 18 commits into from Jan 6, 2017

Conversation

Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Jan 6, 2017 •
edited by alexcrichton

This PR aims to backport all the beta PRs.

Here is a list with their status:

cc @rust-lang/compiler @alexcrichton @brson #

@rust-highfive rust-highfive assigned nrc Jan 6, 2017

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Jan 6, 2017

r? @nrc

(rust_highfive has picked a reviewer for you, use r? to override)
@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Jan 6, 2017

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@nikomatsakis nikomatsakis assigned alexcrichton and unassigned nrc Jan 6, 2017

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Jan 6, 2017 •
edited

Argh. Seems like something didn't backport cleanly, probably the last PR.

Fixed.

@nikomatsakis nikomatsakis changed the title Most T-compiler beta backports Beta backports Jan 6, 2017

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jan 6, 2017

@nikomatsakis could you back out the backport of 4781eb3 (the second commit of #38708), we should only need the first commit I believe, specifically d0881ea
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jan 6, 2017

@nikomatsakis your list also claims #38792 was backported but the commits aren't showing up here for me?
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jan 6, 2017

Ok I updated the list in the PR description to also reflect whether the PRs have been merged or not. We have less testing on beta than we do on master, so I personally prefer to wait for a merge to master before backporting, but we can also just re-backport fixes if necessary.
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jan 6, 2017

I unchecked #38792 in the list above due to this comment
@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Jan 6, 2017

@alexcrichton

your list also claims #38792 was backported but the commits aren't showing up here for me?

hmm, yeah, I somehow overlooked that one, but in the other case I had just forgotten to push

could you back out the backport of 4781eb3 (the second commit of #38708), we should only need the first commit I believe, specifically d0881ea

will do

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:beta branch from 003f0e3 to 5f1e32d Jan 6, 2017

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Jan 6, 2017

could you back out the backport of 4781eb3 (the second commit of #38708), we should only need the first commit I believe, specifically d0881ea

done
@brson

This comment has been minimized.

Sign in to view
Copy link
Contributor

brson commented Jan 6, 2017

Wowee! This is amazing. Thanks @nikomatsakis

alexcrichton and others added some commits Dec 30, 2016

@alexcrichton @nikomatsakis
rustbuild: Fix source tarballs and the vendor dir 
The source tarball creation step would attempt to skip a number of files that we
want to ignore ourselves, but once we've hit the vendor directory we don't want
to skip anything so be sure to vendor everything inside that directory.

Closes #38690
bce648c
@alexcrichton @nikomatsakis
rustc: Stabilize the `proc_macro` feature 
This commit stabilizes the `proc_macro` and `proc_macro_lib` features in the
compiler to stabilize the "Macros 1.1" feature of the language. Many more
details can be found on the tracking issue, #35900.

Closes #35900
ce1a38c
@steveklabnik @nikomatsakis
Document custom derive. 
These are some bare-bones documentation for custom derive, needed
to stabilize "macros 1.1",
#35900

The book chapter is based off of a blog post by @cbreeden,
https://cbreeden.github.io/Macros11/

Normally, we have a policy of not mentioning external crates in
documentation. However, given that syn/quote are basically neccesary
for properly using macros 1.1, I feel that not including them here
would make the documentation very bad. So the rules should be bent
in this instance.
Loading status checks…
2cb7a60

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:beta branch from 5f1e32d to 2cb7a60 Jan 6, 2017

@alexcrichton alexcrichton merged commit 47c8713 into rust-lang:beta Jan 6, 2017
1 check was pending

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jan 6, 2017

Thanks @nikomatsakis!

@jseyfried jseyfried referenced this pull request Jan 13, 2017

Closed

rustdoc: rustc panicked at 'assertion failed: !self.is_proc_macro(item_id)' #38638

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.