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.

Sign up for GitHub

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

Jump to bottom

Rollup of 5 pull requests #82705

Closed
wants to merge 13 commits into from
Closed

Rollup of 5 pull requests #82705

wants to merge 13 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 13 commits February 23, 2021 11:13
@GuillaumeGomez
Add --generate-redirect-map option to replace HTML redirection file w…
3a92f77 
…ith a unique JSON map
@GuillaumeGomez
Add tests for --generate-redirect-map option
2b59e76
@GuillaumeGomez
Add full test for rustdoc map file
1a7126b
@GuillaumeGomez
Fix nits
41fc58b
@jyn514
Rename rustdoc lints to be a tool lint instead of built-in.
cc62018 
- Rename `broken_intra_doc_links` to `rustdoc::broken_intra_doc_links`
- Ensure that the old lint names still work and give deprecation errors
- Register lints even when running doctests

  Otherwise, all `rustdoc::` lints would be ignored.

- Register all existing lints as removed

  This unfortunately doesn't work with `register_renamed` because tool
  lints have not yet been registered when rustc is running. For similar
  reasons, `check_backwards_compat` doesn't work either. Call
  `register_removed` directly instead.

- Fix fallout

  + Rustdoc lints for compiler/
  + Rustdoc lints for library/

Note that this does *not* suggest `rustdoc::broken_intra_doc_links` for
`rustdoc::intra_doc_link_resolution_failure`, since there was no time
when the latter was valid.
@jyn514
Move lint machinery into a separate file
37e4cfe
@jyn514
Add declare_rustdoc_lint! macro
7195355
@jyn514
Improve error messages
e8ddfda 
- Use `register_renamed` when rustdoc is running so the lint will still
  be active and use a structured suggestion
- Test the behavior for rustc, not just for rustdoc (because it differs)
@jyn514
Address review comments
0517ea7 
- Move MISSING_CRATE_LEVEL_DOCS to rustdoc directly
- Update documentation

This also takes the opportunity to make the `no-crate-level-doc-lint`
test more specific.
@jyn514
Update comments
c7535d1 
Note that the FIXME was removed because this can't be fixed,
`register_renamed` calls LintId::of and there's no LintId for rustdoc
lints when rustc is running.
@jyn514
Test that using the previous lint names still applies the lint
75efb6e
@GuillaumeGomez
Rollup merge of rust-lang#80527 - jyn514:rustdoc-lints, r=GuillaumeGomez
7837222 
Make rustdoc lints a tool lint instead of built-in

- Rename `broken_intra_doc_links` to `rustdoc::broken_intra_doc_links` (and similar for other rustdoc lints; I don't expect any others to be used frequently, though).
- Ensure that the old lint names still work and give deprecation errors
- Register lints even when running doctests
- Move lint machinery into a separate file
- Add `declare_rustdoc_lint!` macro

Unblocks rust-lang#80300, rust-lang#79816, rust-lang#80965. Makes the strangeness in rust-lang#77364 more apparent to the end user (note that `missing_docs` is *not* moved to rustdoc in this PR). Closes rust-lang#78786.

## Current status

This is blocked on rust-lang#82620 (see rust-lang#80527 (comment))
@GuillaumeGomez
Rollup merge of rust-lang#81223 - GuillaumeGomez:generate-redirect-ma…
16d4476 
…p, r=jyn514

[rustdoc] Generate redirect map file

Fixes rust-lang#81134.

So with this code:

```rust
#![crate_name = "foo"]

pub use private::Quz;
pub use hidden::Bar;

mod private {
    pub struct Quz;
}

#[doc(hidden)]
pub mod hidden {
    pub struct Bar;
}

#[macro_export]
macro_rules! foo {
() => {}
}
```

It generates:

```json
{
  "foo/macro.foo!.html": "foo/macro.foo.html",
  "foo/private/struct.Quz.html": "foo/struct.Quz.html",
  "foo/hidden/struct.Bar.html": "foo/struct.Bar.html"
}
```

Do the pathes look as you expected `@pietroalbini?`

r? `@jyn514`
@rustbot rustbot added the rollup A PR which is a rollup label Mar 2, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=5

@bors
Copy link
Contributor

bors commented Mar 2, 2021

📌 Commit 16d4476 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 2, 2021
@Dylan-DPC-zz
Copy link

@bors rollup=never

@JohnTitor
Copy link
Member

@bors r-
This contains some merged PRs.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 2, 2021
@JohnTitor
Copy link
Member

(Note that the current merge queue isn't synced properly.)

@Dylan-DPC-zz
Copy link

synced now, so no need for this :D

@GuillaumeGomez GuillaumeGomez deleted the rollup-938kcvq branch March 3, 2021 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @bors @Dylan-DPC-zz @JohnTitor @rustbot @jyn514