-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Fix rustdoc --version
when used with download-rustc
#104184
Conversation
Previously, rustdoc would unconditionally report the version that *rustc* was compiled with. That showed things like `nightly-2022-10-30`, which wasn't right, since this was a `dev` build compiled from source. Fix it by changing `rustc_driver::version` to a macro expanded at invocation time.
r? @davidtwco (rustbot has picked a reviewer for you, use r? to override) |
Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 |
I am not sure how to test this ahead of time, modifying rustc means that both rustdoc and rustc are now reporting @bors try |
⌛ Trying commit a68ec22 with merge a7cd917db3301da14641b8794327a9a4499838d8... |
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.
Implementation LGTM, though I hadn't seen decl_macro
used before, so r=me once you're happy this does what you want.
☀️ Try build successful - checks-actions |
Ok yes, this works :)
|
@bors r=davidtwco rollup |
Fix `rustdoc --version` when used with download-rustc Previously, rustdoc would unconditionally report the version that *rustc* was compiled with. That showed things like `nightly-2022-10-30`, which wasn't right, since this was a `dev` build compiled from source. Fix it by changing `rustc_driver::version` to a macro expanded at invocation time. cc rust-lang#103206 (comment)
Fix `rustdoc --version` when used with download-rustc Previously, rustdoc would unconditionally report the version that *rustc* was compiled with. That showed things like `nightly-2022-10-30`, which wasn't right, since this was a `dev` build compiled from source. Fix it by changing `rustc_driver::version` to a macro expanded at invocation time. cc rust-lang#103206 (comment)
…earth Rollup of 9 pull requests Successful merges: - rust-lang#101005 (Migrate rustc_codegen_llvm to SessionDiagnostics) - rust-lang#103307 (Add context to compiler error message) - rust-lang#103464 (Add support for custom mir) - rust-lang#103929 (Cleanup Apple-related code in rustc_target) - rust-lang#104015 (Remove linuxkernel targets) - rust-lang#104020 (Limit efiapi calling convention to supported arches) - rust-lang#104156 (Cleanups in autoderef impl) - rust-lang#104171 (Update books) - rust-lang#104184 (Fix `rustdoc --version` when used with download-rustc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Previously, rustdoc would unconditionally report the version that rustc was compiled with. That showed things like
nightly-2022-10-30
, which wasn't right, since this was adev
build compiled from source.Fix it by changing
rustc_driver::version
to a macro expanded at invocation time.cc #103206 (comment)