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

rustdoc: Rename internal API fns to into_string #74359

Merged
merged 1 commit into from
Jul 16, 2020

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented Jul 15, 2020

to avoid surprising listed in API guidelines.

@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 15, 2020
Copy link
Member

@GuillaumeGomez GuillaumeGomez left a comment

Choose a reason for hiding this comment

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

Thanks!

@GuillaumeGomez
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jul 15, 2020

📌 Commit 351613c347206cd309690b735f4f659d5599eb03 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 Jul 15, 2020
@ollie27
Copy link
Member

ollie27 commented Jul 15, 2020

@bors r-

failed on CI:

error[E0599]: no method named `to_string` found for struct `html::markdown::MarkdownHtml<'_>` in the current scope
    --> src/librustdoc/html/render.rs:2334:18
     |
2334 |                   .to_string()
     |                    ^^^^^^^^^ help: there is an associated function with a similar name: `into_string`
     | 
    ::: src/librustdoc/html/markdown.rs:73:1
     |
73   | / pub struct MarkdownHtml<'a>(
74   | |     pub &'a str,
75   | |     pub &'a mut IdMap,
76   | |     pub ErrorCodes,
77   | |     pub Edition,
78   | |     pub &'a Option<Playground>,
79   | | );
     | |  -
     | |  |
     | |  method `to_string` not found for this
     | |__doesn't satisfy `_: std::fmt::Display`
     |    doesn't satisfy `_: std::string::ToString`
     |
     = note: the method `to_string` exists but the following trait bounds were not satisfied:
             `html::markdown::MarkdownHtml<'_>: std::fmt::Display`
             which is required by `html::markdown::MarkdownHtml<'_>: std::string::ToString`

error: aborting due to previous error

@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 Jul 15, 2020
@GuillaumeGomez
Copy link
Member

@ollie27 Thanks for catching it up!

to avoid surprising listed in API guidelines.
@tesuji tesuji force-pushed the rustdoc-tostring branch from 351613c to 0f4e4a0 Compare July 15, 2020 10:58
@tesuji
Copy link
Contributor Author

tesuji commented Jul 15, 2020

Tests passed locally. Sorry for inconveniences.

@GuillaumeGomez
Copy link
Member

I'll wait for the CI this time. :)

@tesuji tesuji requested a review from GuillaumeGomez July 16, 2020 13:45
@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jul 16, 2020

📌 Commit 0f4e4a0 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 16, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020
…eGomez

rustdoc: Rename internal API fns to `into_string`

to avoid surprising listed in API guidelines.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020
…eGomez

rustdoc: Rename internal API fns to `into_string`

to avoid surprising listed in API guidelines.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020
…eGomez

rustdoc: Rename internal API fns to `into_string`

to avoid surprising listed in API guidelines.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2020
…arth

Rollup of 21 pull requests

Successful merges:

 - rust-lang#73566 (Don't run `everybody_loops` for rustdoc; instead ignore resolution errors)
 - rust-lang#73771 (Don't pollute docs/suggestions with libstd deps)
 - rust-lang#73794 (Small cleanup for E0705 explanation)
 - rust-lang#73807 (rustdoc: glue tokens before highlighting)
 - rust-lang#73835 (Clean up E0710 explanation)
 - rust-lang#73926 (Ignoring test case: [codegen] repr-transparent-aggregates-1.rs for aarch64)
 - rust-lang#73981 (Remove some `ignore-stage1` annotations.)
 - rust-lang#73998 (add regression test for rust-lang#61216)
 - rust-lang#74140 (Make hir ProjectionKind more precise)
 - rust-lang#74148 (Move #[doc(alias)] check in rustc)
 - rust-lang#74159 (forbid generic params in the type of const params)
 - rust-lang#74171 (Fix 44056 test with debug on macos.)
 - rust-lang#74221 (Don't panic if the lhs of a div by zero is not statically known)
 - rust-lang#74325 (Focus on the current file in the source file sidebar)
 - rust-lang#74359 (rustdoc: Rename internal API fns to `into_string`)
 - rust-lang#74370 (Reintroduce spotlight / "important traits" feature)
 - rust-lang#74390 (Fix typo in std::mem::transmute documentation)
 - rust-lang#74391 (BtreeMap: superficially refactor root access)
 - rust-lang#74392 (const generics triage)
 - rust-lang#74397 (Fix typo in the latest release note)
 - rust-lang#74406 (Set shell for github actions CI)

Failed merges:

r? @ghost
@bors bors merged commit 61fccf0 into rust-lang:master Jul 16, 2020
@tesuji tesuji deleted the rustdoc-tostring branch July 17, 2020 00:37
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants