Skip to content

Fixing escaping to ensure generation of welformed json. - #77890

Merged
bors merged 1 commit into
rust-lang:masterfrom
gilescope:welformed-json-output-from-libtest
Oct 23, 2020
Merged

Fixing escaping to ensure generation of welformed json.#77890
bors merged 1 commit into
rust-lang:masterfrom
gilescope:welformed-json-output-from-libtest

Conversation

@gilescope

@gilescopegilescope commented Oct 13, 2020

Copy link
Copy Markdown
Contributor

doc tests' json name have a filename in them. When json test output is asked for on windows currently produces invalid json.
Tracking issue for json test output: #49359

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @KodrAus

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2020
@gilescopegilescope changed the title Fixing escaping to ensure generation of welformed json.WIP: Fixing escaping to ensure generation of welformed json.Oct 13, 2020
@gilescope
gilescopeforce-pushed the welformed-json-output-from-libtest branch 3 times, most recently from db3aeb7 to 747520bCompareOctober 13, 2020 08:16
@gilescope
gilescopeforce-pushed the welformed-json-output-from-libtest branch from 747520b to 0c32e81CompareOctober 13, 2020 08:34
@gilescopegilescope changed the title WIP: Fixing escaping to ensure generation of welformed json.Fixing escaping to ensure generation of welformed json.Oct 14, 2020
@KodrAus

Copy link
Copy Markdown
Contributor

Thanks @gilescope!

@bors r+

@bors

bors commented Oct 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0c32e81 has been approved by KodrAus

@bors

bors commented Oct 23, 2020

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@borsbors 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 Oct 23, 2020
@JohnTitorJohnTitor mentioned this pull request Oct 23, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 23, 2020
Rollup of 17 pull requests
Successful merges:
- rust-lang#77268 (Link to "Contributing to Rust" rather than "Getting Started".)
- rust-lang#77339 (Implement TryFrom between NonZero types.)
- rust-lang#77488 (Mark `repr128` as `incomplete_features`)
- rust-lang#77890 (Fixing escaping to ensure generation of welformed json.)
- rust-lang#77918 (Cleanup network tests)
- rust-lang#77920 (Avoid extraneous space between visibility kw and ident for statics)
- rust-lang#77969 (Doc formating consistency between slice sort and sort_unstable, and big O notation consistency)
- rust-lang#78098 (Clean up and improve some docs)
- rust-lang#78116 (Make inline const work in range patterns)
- rust-lang#78153 (Sync LLVM submodule if it has been initialized)
- rust-lang#78163 (Clean up lib docs)
- rust-lang#78169 (Update cargo)
- rust-lang#78231 (Make closures inherit the parent function's target features)
- rust-lang#78235 (Explain where the closure return type was inferred)
- rust-lang#78255 (Reduce diagram mess in 'match arms have incompatible types' error)
- rust-lang#78263 (Add regression test of issue-77668)
- rust-lang#78265 (Add some inference-related regression tests about incorrect diagnostics)
Failed merges:
r? `@ghost`
@bors
bors merged commit 4859786 into rust-lang:masterOct 23, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 23, 2020
@gilescope
gilescope deleted the welformed-json-output-from-libtest branch October 24, 2020 07:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

5 participants

@gilescope@rust-highfive@KodrAus@bors@rustbot