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

Dedupe typeorigin #23691

Merged
merged 3 commits into from
Mar 26, 2015
Merged

Dedupe typeorigin #23691

merged 3 commits into from
Mar 26, 2015

Conversation

richo
Copy link
Contributor

@richo richo commented Mar 25, 2015

I've started on refactoring the error handling code to avoid the need to reparse generated errors in span_*, but would rather land this incrementally as one monolithic PR (and have un-fond memories of merge conflicts from various other monoliths)

r? @eddyb

@richo richo changed the title Dedupe typeorigin mergable Dedupe typeorigin Mar 25, 2015
@richo richo force-pushed the dedup-typeorigin-mergable branch from 6fac3a1 to 00a0fce Compare March 25, 2015 05:39
@@ -22,6 +22,7 @@ pub use middle::ty::IntVarValue;
pub use self::freshen::TypeFreshener;
pub use self::region_inference::GenericKind;

use core::fmt;
Copy link
Member

Choose a reason for hiding this comment

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

Isn't this exported through std::fmt as well?

@eddyb
Copy link
Member

eddyb commented Mar 26, 2015

LGTM, modulo nits.

@richo richo force-pushed the dedup-typeorigin-mergable branch from 00a0fce to f5d2eba Compare March 26, 2015 04:43
richo added 3 commits March 25, 2015 21:44
This doesn't actually solve the issue that prompted this, at:

https://github.com/rust-lang/rust/blob/master/src/librustc/session/mod.rs#L262-271

But skimming the cfg it appears that all type information has been
discarded long before that point.
@richo richo force-pushed the dedup-typeorigin-mergable branch from f5d2eba to c193fe4 Compare March 26, 2015 04:44
@richo
Copy link
Contributor Author

richo commented Mar 26, 2015

Nits addressed! Thanks for that.

r? @eddyb

@eddyb
Copy link
Member

eddyb commented Mar 26, 2015

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Mar 26, 2015

📌 Commit c193fe4 has been approved by eddyb

@bors
Copy link
Contributor

bors commented Mar 26, 2015

⌛ Testing commit c193fe4 with merge b0fd67b...

bors added a commit that referenced this pull request Mar 26, 2015
I've started on refactoring the error handling code to avoid the need to reparse generated errors in `span_*`, but would rather land this incrementally as one monolithic PR (and have un-fond memories of merge conflicts from various other monoliths)

r? @eddyb
@bors bors merged commit c193fe4 into rust-lang:master Mar 26, 2015
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