Use the generated root module via a relative path #309
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emilio
approved these changes
Dec 2, 2016
| .ancestors(ctx) | ||
| .filter(|id| ctx.resolve_item(*id).is_module()) | ||
| .map(|_| super_.clone()) | ||
| .chain(iter::once(super_.clone())); |
There was a problem hiding this comment.
nit: I don't think you need this clone.
| use std::mem; | ||
| use std::ops; | ||
| use syntax::abi::Abi; | ||
| use syntax::ast; | ||
| use syntax::codemap::{Span, respan}; | ||
| use syntax::ptr::P; | ||
|
|
||
| fn root_import(ctx: &BindgenContext) -> P<ast::Item> { | ||
| fn root_import(ctx: &BindgenContext, module: &Item) -> P<ast::Item> { |
There was a problem hiding this comment.
Probably assert!(module.is_module())?
|
Thanks, @emilio ! |
We previously generated uses of the root module with absolute paths:
use root;
However this only works if the generated bindings are the root of the
crate. If they were in some submodule then that path would not be
valid. They are now generated relative to the current module, like this:
use self::super::super::root;
Fixes rust-lang#96
fitzgen
force-pushed
the
use-root-relative
branch
from
512f4a6
to
8091fd6
Compare
|
@bors-servo r=emilio |
|
📌 Commit 8091fd6 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Dec 2, 2016
Use the generated root module via a relative path
We previously generated uses of the root module with absolute paths:
use root;
However this only works if the generated bindings are the root of the
crate. If they were in some submodule then that path would not be
valid. They are now generated relative to the current module, like this:
use self::super::super::root;
Fixes #96
r? @emilio
|
☀️ Test successful - status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We previously generated uses of the root module with absolute paths:
However this only works if the generated bindings are the root of the
crate. If they were in some submodule then that path would not be
valid. They are now generated relative to the current module, like this:
Fixes #96
r? @emilio