remove the unstable rustdoc parameter --linker #63834
Merged
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
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
andjo403
force-pushed
the
rustdoc-linker-remove
branch
from
2289393
to
85ed91c
Compare
JohnTitor
added
the
S-waiting-on-review
|
☔ The latest upstream changes (presumably #63827) made this pull request unmergeable. Please resolve the merge conflicts. |
andjo403
force-pushed
the
rustdoc-linker-remove
branch
from
85ed91c
to
d097dda
Compare
|
ping @steveklabnik |
| cmd.arg("--linker").arg(linker).arg("-Z").arg("unstable-options"); | ||
| let mut arg = OsString::from("-Clinker="); | ||
| arg.push(&linker); | ||
| cmd.arg(arg); |
There was a problem hiding this comment.
The better way to do this is just .arg("-Clinker").arg(&linker)
There was a problem hiding this comment.
tired to do like that but did not get it to work
when I test with rustc -Clinker /usr/bin/cc I get an error
error: codegen option linker requires a path (C linker=<value>)
There was a problem hiding this comment.
Hm, that seems buggy. Oh well, let's leave it like this then.
src/bootstrap/test.rs
Outdated
| @@ -1124,7 +1124,7 @@ impl Step for Compiletest { | |||
| flags.push(builder.config.cmd.rustc_args().join(" ")); | |||
|
|
|||
| if let Some(linker) = builder.linker(target) { | |||
| cmd.arg("--linker").arg(linker); | |||
| cmd.arg(format!("-Clinker={}", linker.display())); | |||
There was a problem hiding this comment.
Same as before, we want to avoid display() if at all possible as it's lossy, we can pass two args here just fine
There was a problem hiding this comment.
ought not have updated this file at all as it is not calling rustdoc
resulting in failed test
| .arg(linker) | ||
| .arg("-Z") | ||
| .arg("unstable-options"); | ||
| rustdoc.arg(format!("-Clinker={}", linker)); |
There was a problem hiding this comment.
Same two arg situation here too
Mark-Simulacrum
added
the
T-rustdoc
|
@rust-lang/rustdoc We're going to remove |
|
gott a comment about that the removal shall be ok in #63816 (comment) |
|
I don’t generally review rustdoc PRs, sorry about that! Looks like you’re getting a review now though.
|
|
Looks good to me, especially now that it was broken by #63827. |
|
@bors r+ |
|
📌 Commit d097dda34e578728ac7f8afad99fa092adafcdc7 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit d097dda34e578728ac7f8afad99fa092adafcdc7 with merge 0e72d803ab2015db9139191d1a7a109acf9c7b93... |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
use the code generation parameter -Clinker (same parameter as rustc) to control what linker to use for building the rustdoc test executables. closes: rust-lang#63816
andjo403
force-pushed
the
rustdoc-linker-remove
branch
from
d097dda
to
f0b30c7
Compare
|
@Mark-Simulacrum needs a new review updated an file with Compiletest by mistake |
|
@bors r+ |
|
📌 Commit f0b30c7 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Sep 2, 2019
remove the unstable rustdoc parameter --linker use the code generation parameter -Clinker (same parameter as rustc) to control what linker to use for building the rustdoc test executables. closes: #63816
|
☀️ Test successful - checks-azure |
|
@Mark-Simulacrum shall this also be marked as relnotes as it adds the possibility to use the -Clinker option on stable? |
Mark-Simulacrum
added
the
relnotes
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Nov 11, 2019
Pkgsrc changes:
* Remove patch which no longer applies (but what about RPATH?)
* Adapt a few patches to changed files upstream.
Upstream changes:
Version 1.39.0 (2019-11-07)
===========================
Language
--------
- [You can now create `async` functions and blocks with `async fn`,
`async move {}`, and `async {}` respectively, and you can now call
`.await` on async expressions.][63209]
- [You can now use certain attributes on function, closure, and function
pointer parameters.][64010] These attributes include `cfg`, `cfg_attr`,
`allow`, `warn`, `deny`, `forbid` as well as inert helper attributes used
by procedural macro attributes applied to items. e.g.
```rust
fn len(
#[cfg(windows)] slice: &[u16],
#[cfg(not(windows))] slice: &[u8],
) -> usize {
slice.len()
}
```
- [You can now take shared references to bind-by-move patterns in the
`if` guards of `match` arms.][63118] e.g.
```rust
fn main() {
let array: Box<[u8; 4]> = Box::new([1, 2, 3, 4]);
match array {
nums
// ---- `nums` is bound by move.
if nums.iter().sum::<u8>() == 10
// ^------ `.iter()` implicitly takes a reference to `nums`.
=> {
drop(nums);
// ----------- Legal as `nums` was bound by move and so we have ownership.
}
_ => unreachable!(),
}
}
```
Compiler
--------
- [Added tier 3\* support for the `i686-unknown-uefi` target.][64334]
- [Added tier 3 support for the `sparc64-unknown-openbsd` target.][63595]
- [rustc will now trim code snippets in diagnostics to fit in your terminal.]
[63402] **Note** Cargo currently doesn't use this feature. Refer to
[cargo#7315][cargo/7315] to track this feature's progress.
- [You can now pass `--show-output` argument to test binaries to print the
output of successful tests.][62600]
\* Refer to Rust's [platform support page][forge-platform-support] for more
information on Rust's tiered platform support.
Libraries
---------
- [`Vec::new` and `String::new` are now `const` functions.][64028]
- [`LinkedList::new` is now a `const` function.][63684]
- [`str::len`, `[T]::len` and `str::as_bytes` are now `const` functions.][63770]
- [The `abs`, `wrapping_abs`, and `overflowing_abs` numeric functions are
now `const`.][63786]
Stabilized APIs
---------------
- [`Pin::into_inner`]
- [`Instant::checked_duration_since`]
- [`Instant::saturating_duration_since`]
Cargo
-----
- [You can now publish git dependencies if supplied with a `version`.]
[cargo/7237]
- [The `--all` flag has been renamed to `--workspace`.][cargo/7241] Using
`--all` is now deprecated.
Misc
----
- [You can now pass `-Clinker` to rustdoc to control the linker used
for compiling doctests.][63834]
Compatibility Notes
-------------------
- [Code that was previously accepted by the old borrow checker, but rejected by
the NLL borrow checker is now a hard error in Rust 2018.][63565] This was
previously a warning, and will also become a hard error in the Rust 2015
edition in the 1.40.0 release.
- [`rustdoc` now requires `rustc` to be installed and in the same directory to
run tests.][63827] This should improve performance when running a large
amount of doctests.
- [The `try!` macro will now issue a deprecation warning.][62672] It is
recommended to use the `?` operator instead.
- [`asinh(-0.0)` now correctly returns `-0.0`.][63698] Previously this
returned `0.0`.
[62600]: rust-lang/rust#62600
[62672]: rust-lang/rust#62672
[63118]: rust-lang/rust#63118
[63209]: rust-lang/rust#63209
[63402]: rust-lang/rust#63402
[63565]: rust-lang/rust#63565
[63595]: rust-lang/rust#63595
[63684]: rust-lang/rust#63684
[63698]: rust-lang/rust#63698
[63770]: rust-lang/rust#63770
[63786]: rust-lang/rust#63786
[63827]: rust-lang/rust#63827
[63834]: rust-lang/rust#63834
[63927]: rust-lang/rust#63927
[63933]: rust-lang/rust#63933
[63934]: rust-lang/rust#63934
[63938]: rust-lang/rust#63938
[63940]: rust-lang/rust#63940
[63941]: rust-lang/rust#63941
[63945]: rust-lang/rust#63945
[64010]: rust-lang/rust#64010
[64028]: rust-lang/rust#64028
[64334]: rust-lang/rust#64334
[cargo/7237]: rust-lang/cargo#7237
[cargo/7241]: rust-lang/cargo#7241
[cargo/7315]: rust-lang/cargo#7315
[`Pin::into_inner`]: https://doc.rust-lang.org/std/pin/struct.Pin.html#method.into_inner
[`Instant::checked_duration_since`]: https://doc.rust-lang.org/std/time/struct.Instant.html#method.checked_duration_since
[`Instant::saturating_duration_since`]: https://doc.rust-lang.org/std/time/struct.Instant.html#method.saturating_duration_since
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.
use the code generation parameter -Clinker (same parameter as rustc)
to control what linker to use for building the rustdoc test executables.
closes: #63816