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

map crate numbers between compilations #36460

Merged
merged 2 commits into from
Sep 29, 2016
Merged

Conversation

mikhail-m1
Copy link
Contributor

?r nikomatsakis
issue #35123

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@bluss bluss changed the title map create numbers between compilations map crate numbers between compilations Sep 14, 2016
@nikomatsakis
Copy link
Contributor

@mikhail-m1 huzzah!

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 16, 2016

📌 Commit da3c6b7 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Sep 17, 2016

⌛ Testing commit da3c6b7 with merge 52c2f47...

@bors
Copy link
Contributor

bors commented Sep 17, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@bors
Copy link
Contributor

bors commented Sep 22, 2016

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

@nikomatsakis
Copy link
Contributor

@mikhail-m1 can you rebase to cleanup the history?

@nikomatsakis
Copy link
Contributor

After consulting with @alexcrichton it seems we're not so strict about this.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 28, 2016

📌 Commit 20c1091 has been approved by nikomatsakis

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 29, 2016
map crate numbers between compilations

?r nikomatsakis
issue rust-lang#35123
bors added a commit that referenced this pull request Sep 29, 2016
Rollup of 12 pull requests

- Successful merges: #35286, #35892, #36460, #36704, #36741, #36760, #36787, #36789, #36794, #36803, #36811, #36813
- Failed merges:
@bors bors merged commit 20c1091 into rust-lang:master Sep 29, 2016
@mikhail-m1 mikhail-m1 deleted the 35123-map3 branch September 30, 2016 08:23
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.

4 participants