fix: gleaning rustdocflags from target.cfg(…) is not supported#11323
Merged
bors merged 2 commits intorust-lang:masterfrom Dec 11, 2022
Merged
fix: gleaning rustdocflags from target.cfg(…) is not supported#11323bors merged 2 commits intorust-lang:masterfrom
target.cfg(…) is not supported#11323bors merged 2 commits intorust-lang:masterfrom
Conversation
The bug was `rustflags_from_target` trying to learn rustdocflags from `target.cfg(…).rustflags`, which is definitely wrong. As of this writing, either `target.cfg(…).rustdocflags` or `target.<triple>.rustdocflags` is not supported.
Collaborator
|
r? @ehuss (rustbot has picked a reviewer for you, use r? to override) |
Contributor
|
Thanks! @bors r+ |
Contributor
Contributor
Contributor
|
☀️ Test successful - checks-actions |
weihanglo
added a commit
to weihanglo/rust
that referenced
this pull request
Dec 14, 2022
8 commits in 70898e522116f6c23971e2a554b2dc85fd4c84cd..cc0a320879c17207bbfb96b5d778e28a2c62030d 2022-12-05 19:43:44 +0000 to 2022-12-14 14:46:57 +0000 - artifact deps should works when target field specified coexists with `optional = true` (rust-lang/cargo#11434) - Add `home` crate to cargo crates (rust-lang/cargo#11359) - Use proper git URL for GitHub repos (rust-lang/cargo#11475) - Fixes flock(fd, LOCK_UN) emulation on Solaris. (rust-lang/cargo#11474) - Allow Check targets needed for optional doc-scraping to fail without killing the build (rust-lang/cargo#11450) - fix: gleaning rustdocflags from `target.cfg(…)` is not supported (rust-lang/cargo#11323) - Fix typo (rust-lang/cargo#11470) - resolver.md: Fix naming in example (rust-lang/cargo#11469)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 14, 2022
Update cargo 8 commits in 70898e522116f6c23971e2a554b2dc85fd4c84cd..cc0a320879c17207bbfb96b5d778e28a2c62030d 2022-12-05 19:43:44 +0000 to 2022-12-14 14:46:57 +0000 - artifact deps should works when target field specified coexists with `optional = true` (rust-lang/cargo#11434) - Add `home` crate to cargo crates (rust-lang/cargo#11359) - Use proper git URL for GitHub repos (rust-lang/cargo#11475) - Fixes flock(fd, LOCK_UN) emulation on Solaris. (rust-lang/cargo#11474) - Allow Check targets needed for optional doc-scraping to fail without killing the build (rust-lang/cargo#11450) - fix: gleaning rustdocflags from `target.cfg(…)` is not supported (rust-lang/cargo#11323) - Fix typo (rust-lang/cargo#11470) - resolver.md: Fix naming in example (rust-lang/cargo#11469) r? `@ghost`
4 tasks
github-merge-queue bot
pushed a commit
to privacy-ethereum/zkevm-circuits
that referenced
this pull request
May 16, 2023
### Description Add `rustdocflags` override in `Makefile` when it's macos to make doc test work. Note that `config.toml` doesn't support to specify `rustdocflags` under `[target.'cfg(target_os = "macos")']` (see rust-lang/cargo#11323) so we have to use command line override to add it manually. ### Issue Link Resolves #1410 ### Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ### How Has This Been Tested? On macos, run `make test_doc`. Co-authored-by: Chih Cheng Liang <chihchengliang@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
What does this PR try to resolve?
Fixes #11310
The bug was
rustflags_from_targettrying to learn rustdocflags fromtarget.cfg(…).rustflags, which is definitely wrong.As of this writing, either
target.cfg(…).rustdocflagsortarget.<triple>.rustdocflagsis not supported.How should we test and review this PR?
See f8d1b30 as an example.