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

Correct paths for hexagon-unknown-none-elf platform doc #120533

Merged
merged 1 commit into from
Feb 4, 2024

Conversation

androm3da
Copy link
Contributor

Update the library paths to correctly refer to libdemo{1,2}_hexagon and switch to the release build instead.

Update references to libstandalone to the specific G0/PIC archive instead.

Update the library paths to correctly refer to libdemo{1,2}_hexagon
and switch to the release build instead.

Update references to libstandalone to the specific G0/PIC archive instead.
@rustbot
Copy link
Collaborator

rustbot commented Jan 31, 2024

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 31, 2024
@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 31, 2024

📌 Commit 647a453 has been approved by wesleywiser

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 31, 2024
@androm3da
Copy link
Contributor Author

Thanks @wesleywiser !

After this is merged to master can I cherry-pick it somehow to the 1.76 branch? I think this is beta? The contributing guide is not exactly explicit about how to do this. I'll just make a new PR like this one, but targeting beta?

@wesleywiser
Copy link
Member

@androm3da We just need to tag it as beta-nominated and then the compiler team will decide whether or not to backport it to the beta branch (if that happens, someone from the release team will take care of it).

Could you provide a bit of rationale why it's important this is backported to the 1.76 beta instead of riding the trains in 1.77? (Since this is a doc only change, this doesn't need to be super in-depth but we typically explain why a backport is being requested.)

@wesleywiser wesleywiser added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 31, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 31, 2024
…=wesleywiser

Correct paths for hexagon-unknown-none-elf platform doc

Update the library paths to correctly refer to libdemo{1,2}_hexagon and switch to the release build instead.

Update references to libstandalone to the specific G0/PIC archive instead.
@androm3da
Copy link
Contributor Author

@androm3da We just need to tag it as beta-nominated and then the compiler team will decide whether or not to backport it to the beta branch (if that happens, someone from the release team will take care of it).

Could you provide a bit of rationale why it's important this is backported to the 1.76 beta instead of riding the trains in 1.77? (Since this is a doc only change, this doesn't need to be super in-depth but we typically explain why a backport is being requested.)

The extent of the rationale is that "it was wrong when initially submitted (IIRC this was before the branch)". Following the procedure from the baseline will result in confusing link errors.

It's probably not critical to backport, but I'd prefer it if possible.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 31, 2024
…=wesleywiser

Correct paths for hexagon-unknown-none-elf platform doc

Update the library paths to correctly refer to libdemo{1,2}_hexagon and switch to the release build instead.

Update references to libstandalone to the specific G0/PIC archive instead.
@wesleywiser
Copy link
Member

Thanks! It looks like #117601 landed in 1.77 (current nightly) so depending on how quickly this PR is merged, it might not need a backport at all.

@apiraino
Copy link
Contributor

apiraino commented Feb 1, 2024

Beta backport discussed but decision postponed to next week (Zulip discussion)

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#120484 (Avoid ICE when is_val_statically_known is not of a supported type)
 - rust-lang#120516 (pattern_analysis: cleanup manual impls)
 - rust-lang#120517 (never patterns: It is correct to lower `!` to `_`.)
 - rust-lang#120523 (Improve `io::Read::read_buf_exact` error case)
 - rust-lang#120528 (Store SHOULD_CAPTURE as AtomicU8)
 - rust-lang#120529 (Update data layouts in custom target tests for LLVM 18)
 - rust-lang#120530 (Be less confident when `dyn` suggestion is not checked for object safety)
 - rust-lang#120531 (Remove a bunch of `has_errors` checks that have no meaningful or the wrong effect)
 - rust-lang#120533 (Correct paths for hexagon-unknown-none-elf platform doc)

r? `@ghost`
`@rustbot` modify labels: rollup
@androm3da
Copy link
Contributor Author

Thanks! It looks like #117601 landed in 1.77 (current nightly) so depending on how quickly this PR is merged, it might not need a backport at all.

Okay, my mistake. I was confused about the timing of the branches and made assumptions based on the 1.75 release date announcement that it was to be included in 1.76.

@androm3da
Copy link
Contributor Author

androm3da commented Feb 2, 2024

Beta backport discussed but decision postponed to next week (Zulip discussion)

Sorry, @apiraino I don't think it makes sense to backport this without #117601 and since 117601 was a feature it probably isn't a candidate to backport.

Someone can probably remove the beta-nominated tag.

@apiraino
Copy link
Contributor

apiraino commented Feb 2, 2024

@androm3da no worries and thanks for the additional context. I'll remove the backport nomination

@rustbot label -beta-nominated

@rustbot rustbot removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 2, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#120484 (Avoid ICE when is_val_statically_known is not of a supported type)
 - rust-lang#120516 (pattern_analysis: cleanup manual impls)
 - rust-lang#120517 (never patterns: It is correct to lower `!` to `_`.)
 - rust-lang#120523 (Improve `io::Read::read_buf_exact` error case)
 - rust-lang#120528 (Store SHOULD_CAPTURE as AtomicU8)
 - rust-lang#120529 (Update data layouts in custom target tests for LLVM 18)
 - rust-lang#120530 (Be less confident when `dyn` suggestion is not checked for object safety)
 - rust-lang#120531 (Remove a bunch of `has_errors` checks that have no meaningful or the wrong effect)
 - rust-lang#120533 (Correct paths for hexagon-unknown-none-elf platform doc)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#120484 (Avoid ICE when is_val_statically_known is not of a supported type)
 - rust-lang#120516 (pattern_analysis: cleanup manual impls)
 - rust-lang#120517 (never patterns: It is correct to lower `!` to `_`.)
 - rust-lang#120523 (Improve `io::Read::read_buf_exact` error case)
 - rust-lang#120528 (Store SHOULD_CAPTURE as AtomicU8)
 - rust-lang#120529 (Update data layouts in custom target tests for LLVM 18)
 - rust-lang#120530 (Be less confident when `dyn` suggestion is not checked for object safety)
 - rust-lang#120531 (Remove a bunch of `has_errors` checks that have no meaningful or the wrong effect)
 - rust-lang#120533 (Correct paths for hexagon-unknown-none-elf platform doc)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 4, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120484 (Avoid ICE when is_val_statically_known is not of a supported type)
 - rust-lang#120516 (pattern_analysis: cleanup manual impls)
 - rust-lang#120517 (never patterns: It is correct to lower `!` to `_`.)
 - rust-lang#120523 (Improve `io::Read::read_buf_exact` error case)
 - rust-lang#120528 (Store SHOULD_CAPTURE as AtomicU8)
 - rust-lang#120529 (Update data layouts in custom target tests for LLVM 18)
 - rust-lang#120531 (Remove a bunch of `has_errors` checks that have no meaningful or the wrong effect)
 - rust-lang#120533 (Correct paths for hexagon-unknown-none-elf platform doc)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit edd2494 into rust-lang:master Feb 4, 2024
11 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 4, 2024
Rollup merge of rust-lang#120533 - androm3da:bcain/update_hex_docs, r=wesleywiser

Correct paths for hexagon-unknown-none-elf platform doc

Update the library paths to correctly refer to libdemo{1,2}_hexagon and switch to the release build instead.

Update references to libstandalone to the specific G0/PIC archive instead.
@rustbot rustbot added this to the 1.78.0 milestone Feb 4, 2024
@apiraino
Copy link
Contributor

apiraino commented Feb 8, 2024

Beta backport accepted as per compiler team on Zulip

Going to backport it anyway because it's a nice and not risky. The labels on this PR and the intersection with #117601 were a bit confusing. #117601 is in 1.77 (now beta) but this PR merged too late and is in 1.78 (nightly) so it didn't make it to the beta. Backporting this will result having in the curent beta both #117601 and the platform documentation fix.

@rustbot label +beta-nominated +beta-accepted

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Feb 8, 2024
@cuviper cuviper mentioned this pull request Feb 14, 2024
@cuviper cuviper modified the milestones: 1.78.0, 1.77.0 Feb 14, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 14, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562
- Downgrade xcode rust-lang#120914

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562
- Downgrade xcode rust-lang#120914
- Update jobserver-rs to 0.1.28 rust-lang#120846
- [beta] Update LLVM submodule rust-lang#121132

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants