-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
bootstrap: fix bug preventing the use of custom targets #128283
Conversation
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @albertlarsan68 (or someone else) some time within the next two weeks. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
This PR modifies If appropriate, please update |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
☔ The latest upstream changes (presumably #125443) made this pull request unmergeable. Please resolve the merge conflicts. |
5ba7b62
to
5f0b85a
Compare
This comment has been minimized.
This comment has been minimized.
@rustbot review |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One nit, r=me with it resolved and CI green!
/*if let Some(ref p) = self.file.as_ref { | ||
Some(Path::new(p)) | ||
} else { | ||
None | ||
}*/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you remove this commented out code please?
r=@albertlarsan68 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, r=me after a squash (https://rustc-dev-guide.rust-lang.org/git.html#squash-your-commits)
the bug was caused by two factors: 1. only checking the RUST_TARGET_PATH form, not the full filepath form 2. indirectly trying to use the Debug presentation to get the file path
f09c706
to
6264d2e
Compare
r=@albertlarsan68 done |
@rustbot review |
Thanks for the PR! |
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#127921 (Stabilize unsafe extern blocks (RFC 3484)) - rust-lang#128283 (bootstrap: fix bug preventing the use of custom targets) - rust-lang#128530 (Implement `UncheckedIterator` directly for `RepeatN`) - rust-lang#128551 (chore: refactor backtrace style in panic) - rust-lang#128573 (Simplify `body` usage in rustdoc) - rust-lang#128581 (Assert that all attributes are actually checked via `CheckAttrVisitor` and aren't accidentally usable on completely unrelated HIR nodes) - rust-lang#128603 (Update run-make/used to use `any_symbol_contains`) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#128283 - lolbinarycat:bootstrap-custom-target, r=albertlarsan68 bootstrap: fix bug preventing the use of custom targets the bug was caused by two factors: 1. only checking the RUST_TARGET_PATH form, not the full filepath form 2. indirectly trying to use the Debug presentation to get the file path
the bug was caused by two factors: