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

Give a better error when --theme is not a CSS file #83705

Merged
merged 1 commit into from
Apr 5, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Mar 31, 2021

Before:

error: invalid argument: "bacon.toml"

After:

error: invalid argument: "bacon.toml"
  |
  = help: arguments to --theme must be CSS files

cc #83478

@jyn514 jyn514 added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-diagnostics Area: Messages for errors, warnings, and lints labels Mar 31, 2021
@jyn514
Copy link
Member Author

jyn514 commented Mar 31, 2021

r? @GuillaumeGomez

@jyn514 jyn514 assigned jyn514 and GuillaumeGomez and unassigned jyn514 Mar 31, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 31, 2021
@GuillaumeGomez
Copy link
Member

Please add a rustdoc-ui test.

@jyn514 jyn514 force-pushed the theme-error branch 2 times, most recently from 1ef3609 to 1f11663 Compare March 31, 2021 16:20
@rust-log-analyzer

This comment has been minimized.

Before:

```
error: invalid argument: "bacon.toml"
```

After:
```
error: invalid argument: "bacon.toml"
  |
  = help: arguments to --theme must be CSS files
```
// FIXME Why is -L here?
rustc.arg(input_file); //.arg("-L").arg(&self.config.build_base);
rustc.arg(input_file);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change part of this PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I noticed it while looking for {{src-base}} and it looked super outdated. It's working fine without -L so I don't think the comment is necessary.

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 5, 2021

📌 Commit 29eb686 has been approved by GuillaumeGomez

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 5, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2021
Rollup of 5 pull requests

Successful merges:

 - rust-lang#83368 (Add `download-rustc = "if-unchanged"`)
 - rust-lang#83705 (Give a better error when --theme is not a CSS file)
 - rust-lang#83853 (Disallow the use of high byte registes as operands on x86_64)
 - rust-lang#83877 (Remove unnecessary exceptions to the platform-specific code check)
 - rust-lang#83878 (Fix racing file access in tidy)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a766d63 into rust-lang:master Apr 5, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 5, 2021
@jyn514 jyn514 deleted the theme-error branch April 5, 2021 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-diagnostics Area: Messages for errors, warnings, and lints S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants