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

Always compile rustdoc with debug logging enabled when download-rustc is set #81932

Merged
merged 2 commits into from
Mar 2, 2021

Commits on Mar 1, 2021

  1. Always compile rustdoc with debug logging enabled when `download-rust…

    …c` is set
    
    Previously, logging at DEBUG or below would always be silenced, because
    rustc compiles tracing with the `static_max_level_info` feature. That
    makes sense for release artifacts, but not for developing rustdoc.
    
    Instead, this compiles two different versions of tracing: one in the
    release artifacts, distributed in the sysroot, and a new version
    compiled by rustdoc. Since `rustc_driver` is always linked to the
    version of sysroot, this copy/pastes `init_env_logging` into rustdoc.
    
    The builds the second version of tracing unconditionally; see the code
    for details on why.
    jyn514 committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    65f0b25 View commit details
    Browse the repository at this point in the history
  2. Remove deleted pass from rustdoc test suite

    `src/test/rustdoc-ui/deprecated-attrs.rs`
    tells rustdoc to run the `collapse-docs` pass, which no longer exists
    (it was removed in rust-lang#80261).
    Rustdoc doesn't actually give a proper diagnostic here; instead it
    prints an `error!` log. Now that tracing is compiled unconditionally,
    the log is now being emitted by default, because it's at the error
    level.
    
    rustdoc shouldn't be using `error!` logging for diagnostics in the first
    place, but in the meantime this change gets the testsuite to pass.
    jyn514 committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    6dc9934 View commit details
    Browse the repository at this point in the history