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.

Sign up for GitHub

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

Jump to bottom

metadata: improve some confusing type and module names #37301

Merged
merged 4 commits into from
Oct 23, 2016
Merged

metadata: improve some confusing type and module names #37301

merged 4 commits into from
Oct 23, 2016

Conversation

jseyfried
Copy link
Contributor

r? @eddyb

@eddyb
Copy link
Member

eddyb commented Oct 20, 2016 •
edited
Loading

Merge csearch.rs into cstore.rs.

As I've explained on IRC, this commit will create rebase issues (with at least my lazy-start branch).
The only thing I can think of that will likely keep the csearch.rs methods out of the diff (and prevent conflicts) is to use a third name for the resulting file (e.g. store.rs) - if cstore.rs is smaller, that is - and hope that git is clever enough to see a csearch.rs -> store.rs rename, with some extra bits added.

@eddyb
Copy link
Member

eddyb commented Oct 20, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Oct 20, 2016

📌 Commit 80fe1d2 has been approved by eddyb

@Manishearth Manishearth mentioned this pull request Oct 22, 2016
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 22, 2016
@Manishearth
Rollup merge of rust-lang#37301 - jseyfried:improve_metadata_modules,…
034ae77 
… r=eddyb

metadata: improve some confusing type and module names

r? @eddyb
@bors
Copy link
Contributor

bors commented Oct 22, 2016

⌛ Testing commit 80fe1d2 with merge 335c51b...

@bors
Copy link
Contributor

bors commented Oct 22, 2016

💔 Test failed - auto-mac-cross-ios-opt

@eddyb eddyb mentioned this pull request Oct 22, 2016
Merged
@jseyfried
Copy link
Contributor Author

@bors r=eddyb

@bors
Copy link
Contributor

bors commented Oct 22, 2016

📌 Commit f3993d1 has been approved by eddyb

@bors
Copy link
Contributor

bors commented Oct 22, 2016

⌛ Testing commit f3993d1 with merge 4845add...

bors added a commit that referenced this pull request Oct 22, 2016
@bors
Auto merge of #37301 - jseyfried:improve_metadata_modules, r=eddyb
4845add 
metadata: improve some confusing type and module names

r? @eddyb
@bors
Copy link
Contributor

bors commented Oct 23, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing 4845add to master...

@bors bors merged commit f3993d1 into rust-lang:master Oct 23, 2016
This was referenced Oct 23, 2016
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@eddyb eddyb

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jseyfried @eddyb @bors