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

Switch to git-testament rather than old build.rs #1701

Merged
merged 1 commit into from
Apr 11, 2019

Conversation

kinnison
Copy link
Contributor

@kinnison kinnison commented Mar 9, 2019

Rather than the previous not-very-informative version string
which was generated by build.rs and then not updated unless
build.rs was touched, use the new git-testament crate which
does a more complete job at compile time via a proc-macro.

Signed-off-by: Daniel Silverstone dsilvers@digital-scurf.org

@bors
Copy link
Contributor

bors commented Mar 14, 2019

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

@kinnison kinnison force-pushed the kinnison/better-git-version branch from 58d9fc9 to 103bdfd Compare March 14, 2019 21:40
@bors
Copy link
Contributor

bors commented Mar 15, 2019

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

Copy link
Member

@nrc nrc left a comment

Choose a reason for hiding this comment

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

Seems like a good idea!

src/rustup-cli/common.rs Outdated Show resolved Hide resolved
@kinnison kinnison force-pushed the kinnison/better-git-version branch 3 times, most recently from cf6a053 to 1ad73fa Compare April 3, 2019 09:40
@kinnison kinnison marked this pull request as ready for review April 3, 2019 09:48
@kinnison kinnison force-pushed the kinnison/better-git-version branch from 1ad73fa to 6b95547 Compare April 3, 2019 13:35
@kinnison kinnison changed the title WIP: Switch to git-testament rather than old build.rs Switch to git-testament rather than old build.rs Apr 3, 2019
@kinnison kinnison force-pushed the kinnison/better-git-version branch from 6b95547 to a588ac5 Compare April 10, 2019 08:30
Copy link
Member

@nrc nrc left a comment

Choose a reason for hiding this comment

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

Needs rebasing, feel free to merge after that

Rather than the previous not-very-informative version string
which was generated by build.rs and then not updated unless
build.rs was touched, use the new `git-testament` crate which
does a more complete job at compile time via a proc-macro.

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
@kinnison kinnison force-pushed the kinnison/better-git-version branch from a588ac5 to 3772516 Compare April 11, 2019 07:07
@kinnison kinnison merged commit d587c8a into rust-lang:master Apr 11, 2019
@kinnison kinnison deleted the kinnison/better-git-version branch April 11, 2019 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants