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

Utilize fewer reexports #19407

Merged
merged 1 commit into from
Dec 7, 2014
Merged

Utilize fewer reexports #19407

merged 1 commit into from
Dec 7, 2014

Conversation

frewsxcv
Copy link
Member

In regards to:

#19253 (comment)

This commit:

  • Changes the #deriving code so that it generates code that utilizes fewer
    reexports (in particur Option::, Result::, and Ordering::*), which is necessary to
    remove those reexports in the future
  • Changes other areas of the codebase so that fewer reexports are utilized

@sfackler
Copy link
Member

Thanks!

@frewsxcv
Copy link
Member Author

Yay for Windows issues. Just fixed that last error.

@frewsxcv
Copy link
Member Author

failures:

---- [pretty] run-pass-fulldeps/issue-13560.rs stdout ----

error: auxiliary build of /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt/build/src/test/auxiliary/issue-13560-3.rs failed to compile: 
status: exit code: 101
command: x86_64-apple-darwin/stage2/bin/rustc /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt/build/src/test/auxiliary/issue-13560-3.rs -L x86_64-apple-darwin/test/run-pass-fulldeps --target=x86_64-apple-darwin -L x86_64-apple-darwin/test/run-pass-fulldeps/issue-13560.stage2-x86_64-apple-darwinlibaux --out-dir x86_64-apple-darwin/test/run-pass-fulldeps/issue-13560.stage2-x86_64-apple-darwinlibaux --cfg rtopt --cfg debug -O -L x86_64-apple-darwin/rt
stdout:
------------------------------------------
task 'rustc' panicked at 'index out of bounds: the len is 2952 but the index is 2952', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt/build/src/librbml/lib.rs:156

@sfackler Does this mean we should retry?

bors added a commit that referenced this pull request Nov 30, 2014
In regards to:

#19253 (comment)

This commit:

* Changes the #deriving code so that it generates code that utilizes fewer
  reexports (in particur Option::\*, Result::\*, and Ordering::\*), which is necessary to
  remove those reexports in the future
* Changes other areas of the codebase so that fewer reexports are utilized
@frewsxcv
Copy link
Member Author

warning: tests disabled: gdb on darwing needs root

http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2503/steps/test/logs/warnings%20%2897%29

:(

frewsxcv referenced this pull request in frewsxcv/rust Nov 30, 2014
In regards to:

rust-lang#19253 (comment)

This commit:

* Changes the #deriving code so that it generates code that utilizes fewer
  reexports (in particur Option::* and Result::*), which is necessary to
  remove those reexports in the future
* Changes other areas of the codebase so that fewer reexports are utilized
@frewsxcv
Copy link
Member Author

Got the same error again

@alexcrichton
Copy link
Member

@frewsxcv that's been happening a lot on the buildbots lately and retrying sadly won't fix. It likely has to do with a DefId mismatch of using the wrong crate. For now a number of PRs are blocked on this issue and I think we'll have to fix it before landing this sadly.

@frewsxcv
Copy link
Member Author

frewsxcv commented Dec 1, 2014

@alexcrichton Is there an open GitHub Issue I can follow related to that issue?

@frewsxcv
Copy link
Member Author

frewsxcv commented Dec 3, 2014

Can I get a retry for this now that 719c36c#diff-61bc16bb841787d2ec81342b2369db1bR18 happened?

In regards to:

rust-lang#19253 (comment)

This commit:

* Changes the #deriving code so that it generates code that utilizes fewer
  reexports (in particur Option::* and Result::*), which is necessary to
  remove those reexports in the future
* Changes other areas of the codebase so that fewer reexports are utilized
@frewsxcv
Copy link
Member Author

frewsxcv commented Dec 5, 2014

Rebased off master and fixed conflicts

@frewsxcv
Copy link
Member Author

frewsxcv commented Dec 6, 2014

This will need a retry once the Android build stops failing everything

@frewsxcv
Copy link
Member Author

frewsxcv commented Dec 6, 2014

Looks like the Android issue is fixed. May I get a retry?

bors added a commit that referenced this pull request Dec 7, 2014
In regards to:

#19253 (comment)

This commit:

* Changes the #deriving code so that it generates code that utilizes fewer
  reexports (in particur Option::\*, Result::\*, and Ordering::\*), which is necessary to
  remove those reexports in the future
* Changes other areas of the codebase so that fewer reexports are utilized
@bors bors closed this Dec 7, 2014
@bors bors merged commit 4ef1674 into rust-lang:master Dec 7, 2014
@frewsxcv frewsxcv deleted the rm-reexports branch December 7, 2014 14:57
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Dec 9, 2014
Brief note: This does *not* affect anything in the prelude

Part of rust-lang#19253

All this does is remove the reexporting of Result and Option from their
respective modules. More core reexports might be removed, but these ones
are the safest to remove since these enums (and their variants) are included in
the prelude.

Depends on rust-lang#19407 which is merged, but might need a new snapshot

[breaking-change]
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Dec 22, 2014
Part of rust-lang#19253

I would have removed this public reexport in rust-lang#19842, but rust-lang#19812 hadn't merged (and snapshotted) at the time

In rust-lang#19407, I changed the codebase to stop utilizing this reexport

[breaking-change]
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Dec 22, 2014
Part of rust-lang#19253

I would have removed this public reexport in rust-lang#19842, but rust-lang#19812 hadn't merged (and snapshotted) at the time

In rust-lang#19407, I changed the codebase to stop utilizing this reexport

[breaking-change]
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.

5 participants