Skip to content

Fix some bugs reported by eslint#81299

Merged
bors merged 1 commit intorust-lang:masterfrom
GuillaumeGomez:fix-eslint-detected-bugs
Jan 26, 2021
Merged

Fix some bugs reported by eslint#81299
bors merged 1 commit intorust-lang:masterfrom
GuillaumeGomez:fix-eslint-detected-bugs

Conversation

@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jan 23, 2021

Simply went into src/librustdoc/html/static/ and ran eslint *.js in case you want to reproduce. :)

r? @Nemo157

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-ui Area: Rustdoc UI (generated HTML) labels Jan 23, 2021
@rust-highfive
Copy link
Contributor

rust-highfive commented Jan 23, 2021

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 23, 2021
camelid
camelid reviewed Jan 23, 2021
View reviewed changes
Nemo157
Nemo157 reviewed Jan 25, 2021
View reviewed changes
src/librustdoc/html/static/main.js Outdated
Copy link
Contributor

@Nemo157 Nemo157 Jan 25, 2021

Choose a reason for hiding this comment

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

Seems this comment is also unnecessary now?

Copy link
Member Author

@GuillaumeGomez GuillaumeGomez Jan 25, 2021

Choose a reason for hiding this comment

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

Absolutely!

src/librustdoc/html/static/storage.js Outdated
Copy link
Contributor

@Nemo157 Nemo157 Jan 25, 2021

Choose a reason for hiding this comment

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

There's no eslint directive to say that these functions are "exported"?

Copy link
Member Author

@GuillaumeGomez GuillaumeGomez Jan 25, 2021

Choose a reason for hiding this comment

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

Apparently not... :-/

@GuillaumeGomez GuillaumeGomez force-pushed the fix-eslint-detected-bugs branch from 796d05a to 042facb Compare January 25, 2021 09:33
@Nemo157
Copy link
Contributor

Nemo157 commented Jan 25, 2021

Lets see if I can do this now 😁

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 25, 2021

📌 Commit 042facb has been approved by Nemo157

@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 Jan 25, 2021
@bors
Copy link
Collaborator

bors commented Jan 25, 2021

⌛ Testing commit 042facb with merge bae7aa88630debeb911b5321500902a95f276526...

@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Jan 25, 2021

The job dist-x86_64-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
    Checking rustfix v0.5.1
error[E0283]: type annotations needed
   --> src/cargo/util/config/de.rs:530:63
    |
530 |                 seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
    |                                                           |   |
    |                                                           |   |
    |                                                           |   cannot infer type for type parameter `T` declared on the trait `AsRef`
    |                                                           this method call resolves to `&T`
    |
    = note: cannot satisfy `std::string::String: AsRef<_>`
help: use the fully qualified path for the potential candidates
    |
530 |                 seed.deserialize(Tuple2Deserializer(1i32, <std::string::String as AsRef<OsStr>>::as_ref(env)))
    |                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
530 |                 seed.deserialize(Tuple2Deserializer(1i32, <std::string::String as AsRef<std::path::Path>>::as_ref(env)))
    |                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
530 |                 seed.deserialize(Tuple2Deserializer(1i32, <std::string::String as AsRef<str>>::as_ref(env)))
    |                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
530 |                 seed.deserialize(Tuple2Deserializer(1i32, <std::string::String as AsRef<[u8]>>::as_ref(env)))

error: aborting due to previous error

For more information about this error, try `rustc --explain E0283`.

@bors
Copy link
Collaborator

bors commented Jan 25, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 25, 2021
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Jan 25, 2021

This error is definitely not linked to this PR... Let's retry then.

@bors: retry

@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 Jan 25, 2021
@jonas-schievink jonas-schievink mentioned this pull request Jan 25, 2021
Closed
This was referenced Jan 25, 2021
Closed
Closed
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 26, 2021
@JohnTitor
Rollup merge of rust-lang#81299 - GuillaumeGomez:fix-eslint-detected-…
796bd53 
…bugs, r=Nemo157

Fix some bugs reported by eslint

Simply went into `src/librustdoc/html/static/` and ran `eslint *.js` in case you want to reproduce. :)

r? `````@Nemo157`````
@JohnTitor JohnTitor mentioned this pull request Jan 26, 2021
Closed
@JohnTitor JohnTitor mentioned this pull request Jan 26, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2021
@bors
Auto merge of rust-lang#81417 - JohnTitor:rollup-yi3q05s, r=JohnTitor
d1aed50 
Rollup of 14 pull requests

Successful merges:

 - rust-lang#80812 (Update RELEASES.md for 1.50.0)
 - rust-lang#80876 (Add `unwrap_unchecked()` methods for `Option` and `Result`)
 - rust-lang#80900 (Fix ICE with `ReadPointerAsBytes` validation error)
 - rust-lang#81191 (BTreeMap: test all borrowing interfaces and test more chaotic order behavior)
 - rust-lang#81195 (Account for generics when suggesting bound)
 - rust-lang#81299 (Fix some bugs reported by eslint)
 - rust-lang#81325 (typeck: Don't suggest converting LHS exprs)
 - rust-lang#81353 (Fix spelling in documentation for error E0207)
 - rust-lang#81369 (rustc_codegen_ssa: use wall time for codegen_to_LLVM_IR time-passes entry)
 - rust-lang#81389 (rustdoc: Document CommonMark extensions.)
 - rust-lang#81399 (Update books)
 - rust-lang#81401 (tidy: Some code cleanup.)
 - rust-lang#81407 (Refine "remove semicolon" suggestion in trait selection)
 - rust-lang#81412 (Fix assertion in `MaybeUninit::array_assume_init()` for zero-length arrays)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1308c14 into rust-lang:master Jan 26, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 26, 2021
@GuillaumeGomez GuillaumeGomez deleted the fix-eslint-detected-bugs branch January 27, 2021 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@camelid camelid camelid left review comments

+1 more reviewer

@Nemo157 Nemo157 Nemo157 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@Nemo157 Nemo157

Labels

A-rustdoc-ui Area: Rustdoc UI (generated HTML) 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

Milestone

1.51.0

Development

Successfully merging this pull request may close these issues.

7 participants

@GuillaumeGomez @rust-highfive @Nemo157 @bors @rust-log-analyzer @camelid @rustbot