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: fix emitting duplicate implementors in .js files #33509

Merged
merged 1 commit into from
May 10, 2016

Conversation

birkenfeld
Copy link
Contributor

The collect() fn checks for double quotes; use them here as well.

Fixes: #30219

The collect() fn checks for double quotes; use them here as well.

Fixes: rust-lang#30219
@rust-highfive
Copy link
Collaborator

r? @steveklabnik

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

@@ -783,7 +783,7 @@ fn write_shared(cx: &Context,
try_err!(write!(&mut f, "{}", *implementor), &mydst);
}

try_err!(write!(&mut f, r"implementors['{}'] = [", krate.name), &mydst);
try_err!(write!(&mut f, r#"implementors["{}"] = ["#, krate.name), &mydst);
Copy link
Member

Choose a reason for hiding this comment

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

I'm wondering if it wouldn't be better to just use escaped double quotes...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@alexcrichton
Copy link
Member

@bors: r+ ba17bd0

Thanks!

Manishearth added a commit to Manishearth/rust that referenced this pull request May 9, 2016
rustdoc: fix emitting duplicate implementors in .js files

The collect() fn checks for double quotes; use them here as well.

Fixes: rust-lang#30219
Manishearth added a commit to Manishearth/rust that referenced this pull request May 9, 2016
rustdoc: fix emitting duplicate implementors in .js files

The collect() fn checks for double quotes; use them here as well.

Fixes: rust-lang#30219
bors added a commit that referenced this pull request May 9, 2016
Rollup of 10 pull requests

- Successful merges: #33129, #33224, #33370, #33383, #33431, #33474, #33480, #33496, #33509, #33514
- Failed merges:
Manishearth added a commit to Manishearth/rust that referenced this pull request May 9, 2016
rustdoc: fix emitting duplicate implementors in .js files

The collect() fn checks for double quotes; use them here as well.

Fixes: rust-lang#30219
bors added a commit that referenced this pull request May 9, 2016
Rollup of 10 pull requests

- Successful merges: #33129, #33224, #33370, #33383, #33431, #33474, #33480, #33496, #33509, #33514
- Failed merges:
@bors bors merged commit ba17bd0 into rust-lang:master May 10, 2016
@birkenfeld birkenfeld deleted the issue-30219 branch May 10, 2016 05:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants