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

Implement Clone, Display for ascii::EscapeDefault #63421

Merged
merged 1 commit into from Aug 14, 2019

Conversation

@clarfon
Copy link
Contributor

commented Aug 9, 2019

This will mimic the same behaviour as the char version; Displaying the iterator will give its string representation without advancing it.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 9, 2019

r? @dtolnay

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

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Aug 9, 2019

The job mingw-check of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-08-09T18:59:42.5412469Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-09T18:59:42.5631488Z ##[command]git config gc.auto 0
2019-08-09T18:59:42.5698262Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-09T18:59:42.5776993Z ##[command]git config --get-all http.proxy
2019-08-09T18:59:42.5918637Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63421/merge:refs/remotes/pull/63421/merge
---
2019-08-09T19:00:18.4811620Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-09T19:00:18.4811691Z 
2019-08-09T19:00:18.4812292Z   git checkout -b <new-branch-name>
2019-08-09T19:00:18.4812477Z 
2019-08-09T19:00:18.4812854Z HEAD is now at 24512b598 Merge 1f0f9ddb282e0ed85c9fdc0d9b430ac23bdde17d into 534b42394d743511db1335d5ed08d507ab7c6e73
2019-08-09T19:00:18.4985119Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-09T19:00:18.4988527Z ==============================================================================
2019-08-09T19:00:18.4988589Z Task         : Bash
2019-08-09T19:00:18.4988635Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-09T19:05:40.4444429Z 
2019-08-09T19:05:47.4228738Z error[E0308]: mismatched types
2019-08-09T19:05:47.4232307Z    --> src/libcore/ascii.rs:137:21
2019-08-09T19:05:47.4233548Z     |
2019-08-09T19:05:47.4234324Z 137 |         f.write_str(&self.data[self.range])
2019-08-09T19:05:47.4235029Z     |                     ^^^^^^^^^^^^^^^^^^^^^^ expected str, found slice
2019-08-09T19:05:47.4236304Z     = note: expected type `&str`
2019-08-09T19:05:47.4236881Z                found type `&[u8]`
2019-08-09T19:05:47.4237180Z 
2019-08-09T19:05:48.8019292Z    Compiling libc v0.2.60
---
2019-08-09T19:05:51.4964419Z For more information about this error, try `rustc --explain E0308`.
2019-08-09T19:05:51.5999250Z error: Could not compile `core`.
2019-08-09T19:05:51.6014465Z warning: build failed, waiting for other jobs to finish...
2019-08-09T19:05:51.8433692Z error: build failed
2019-08-09T19:05:51.8456625Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
2019-08-09T19:05:51.8469446Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2019-08-09T19:05:51.8470055Z Build completed unsuccessfully in 0:02:19
2019-08-09T19:05:51.8470055Z Build completed unsuccessfully in 0:02:19
2019-08-09T19:06:06.0597178Z ##[error]Bash exited with code '1'.
2019-08-09T19:06:06.0650055Z ##[section]Starting: Checkout
2019-08-09T19:06:06.0652539Z ==============================================================================
2019-08-09T19:06:06.0652609Z Task         : Get sources
2019-08-09T19:06:06.0652687Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@clarfon clarfon force-pushed the clarfon:escape_default branch from 1f0f9dd to a6b6290 Aug 9, 2019

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Aug 9, 2019

The job mingw-check of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-08-09T19:23:58.5275920Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-09T19:23:58.5476337Z ##[command]git config gc.auto 0
2019-08-09T19:23:58.5535271Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-09T19:23:58.5580126Z ##[command]git config --get-all http.proxy
2019-08-09T19:23:58.5717280Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63421/merge:refs/remotes/pull/63421/merge
---
2019-08-09T19:24:33.3848789Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-09T19:24:33.3849043Z 
2019-08-09T19:24:33.3849475Z   git checkout -b <new-branch-name>
2019-08-09T19:24:33.3849744Z 
2019-08-09T19:24:33.3849966Z HEAD is now at ad4c97316 Merge a6b62904d00f5198cf05daec2fcafb947b508432 into 534b42394d743511db1335d5ed08d507ab7c6e73
2019-08-09T19:24:33.4001118Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-09T19:24:33.4004376Z ==============================================================================
2019-08-09T19:24:33.4004435Z Task         : Bash
2019-08-09T19:24:33.4004481Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-09T19:29:42.5162324Z    Compiling libc v0.2.60
2019-08-09T19:29:43.4098640Z    Compiling build_helper v0.1.0 (/checkout/src/build_helper)
2019-08-09T19:29:45.0138088Z    Compiling unwind v0.0.0 (/checkout/src/libunwind)
2019-08-09T19:29:45.5439644Z    Compiling compiler_builtins v0.1.18
2019-08-09T19:29:46.7415110Z error[E0507]: cannot move out of `self.range` which is behind a shared reference
2019-08-09T19:29:46.7429340Z     |
2019-08-09T19:29:46.7429340Z     |
2019-08-09T19:29:46.7434634Z 138 |         f.write_str(from_utf8_unchecked(&self.data[self.range]))
2019-08-09T19:29:46.7440932Z     |                                                    ^^^^^^^^^^ move occurs because `self.range` has type `ops::range::Range<usize>`, which does not implement the `Copy` trait
2019-08-09T19:29:48.0051472Z    Compiling backtrace-sys v0.1.30
2019-08-09T19:29:49.2645349Z    Compiling cmake v0.1.38
2019-08-09T19:29:49.6024621Z error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
2019-08-09T19:29:49.6033460Z    --> src/libcore/ascii.rs:138:21
2019-08-09T19:29:49.6033460Z    --> src/libcore/ascii.rs:138:21
2019-08-09T19:29:49.6040126Z     |
2019-08-09T19:29:49.6045743Z 138 |         f.write_str(from_utf8_unchecked(&self.data[self.range]))
2019-08-09T19:29:49.6052213Z     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
2019-08-09T19:29:49.6058594Z     |
2019-08-09T19:29:49.6102259Z     = note: consult the function's documentation for information on how to avoid undefined behavior
2019-08-09T19:29:49.6102595Z error: aborting due to 2 previous errors
2019-08-09T19:29:49.6102628Z 
2019-08-09T19:29:49.6102839Z Some errors have detailed explanations: E0133, E0507.
2019-08-09T19:29:49.6103098Z For more information about an error, try `rustc --explain E0133`.
2019-08-09T19:29:49.6103098Z For more information about an error, try `rustc --explain E0133`.
2019-08-09T19:29:49.7429145Z error: Could not compile `core`.
2019-08-09T19:29:49.7429490Z warning: build failed, waiting for other jobs to finish...
2019-08-09T19:29:51.2593741Z error: build failed
2019-08-09T19:29:51.2655264Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
2019-08-09T19:29:51.2660638Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2019-08-09T19:29:51.2660731Z Build completed unsuccessfully in 0:02:18
2019-08-09T19:29:51.2660731Z Build completed unsuccessfully in 0:02:18
2019-08-09T19:30:05.1657197Z ##[error]Bash exited with code '1'.
2019-08-09T19:30:05.1693570Z ##[section]Starting: Checkout
2019-08-09T19:30:05.1696071Z ==============================================================================
2019-08-09T19:30:05.1696145Z Task         : Get sources
2019-08-09T19:30:05.1696189Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@clarfon clarfon force-pushed the clarfon:escape_default branch from a6b6290 to 455c5f7 Aug 10, 2019

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Aug 10, 2019

The job mingw-check of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-08-10T01:42:08.8915341Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-10T01:42:08.9109700Z ##[command]git config gc.auto 0
2019-08-10T01:42:08.9171168Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-10T01:42:08.9227519Z ##[command]git config --get-all http.proxy
2019-08-10T01:42:08.9363528Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63421/merge:refs/remotes/pull/63421/merge
---
2019-08-10T01:42:44.1283417Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-10T01:42:44.1283457Z 
2019-08-10T01:42:44.1283614Z   git checkout -b <new-branch-name>
2019-08-10T01:42:44.1283636Z 
2019-08-10T01:42:44.1283691Z HEAD is now at 0a9add3b3 Merge 455c5f7ac4701177c9e76730e4548b5558ac6a18 into 0ff76ad8dd90a6beae0018e773936727e5ad5d2a
2019-08-10T01:42:44.1446696Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-10T01:42:44.1450789Z ==============================================================================
2019-08-10T01:42:44.1450874Z Task         : Bash
2019-08-10T01:42:44.1450923Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-10T01:47:45.2578217Z    Compiling libc v0.2.60
2019-08-10T01:47:46.1983037Z    Compiling build_helper v0.1.0 (/checkout/src/build_helper)
2019-08-10T01:47:47.8840316Z    Compiling unwind v0.0.0 (/checkout/src/libunwind)
2019-08-10T01:47:48.3998297Z    Compiling compiler_builtins v0.1.18
2019-08-10T01:47:50.6312376Z error[E0507]: cannot move out of `self.range` which is behind a shared reference
2019-08-10T01:47:50.6314684Z     |
2019-08-10T01:47:50.6314684Z     |
2019-08-10T01:47:50.6315568Z 138 |         f.write_str(unsafe { from_utf8_unchecked(&self.data[self.range]) })
2019-08-10T01:47:50.6316256Z     |                                                             ^^^^^^^^^^ move occurs because `self.range` has type `ops::range::Range<usize>`, which does not implement the `Copy` trait
2019-08-10T01:47:50.9905724Z    Compiling backtrace-sys v0.1.30
2019-08-10T01:47:52.2726454Z    Compiling cmake v0.1.38
2019-08-10T01:47:53.0329346Z error: aborting due to previous error
2019-08-10T01:47:53.0329522Z 
2019-08-10T01:47:53.0329522Z 
2019-08-10T01:47:53.0329839Z For more information about this error, try `rustc --explain E0507`.
2019-08-10T01:47:53.1880818Z error: Could not compile `core`.
2019-08-10T01:47:53.1881218Z warning: build failed, waiting for other jobs to finish...
2019-08-10T01:47:54.5039442Z error: build failed
2019-08-10T01:47:54.5068497Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
2019-08-10T01:47:54.5071154Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2019-08-10T01:47:54.5071215Z Build completed unsuccessfully in 0:02:25
2019-08-10T01:47:54.5071215Z Build completed unsuccessfully in 0:02:25
2019-08-10T01:48:06.3332007Z ##[error]Bash exited with code '1'.
2019-08-10T01:48:06.3367483Z ##[section]Starting: Checkout
2019-08-10T01:48:06.3369089Z ==============================================================================
2019-08-10T01:48:06.3369144Z Task         : Get sources
2019-08-10T01:48:06.3369209Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@clarfon clarfon force-pushed the clarfon:escape_default branch from 455c5f7 to 51ce121 Aug 10, 2019

@dtolnay
Copy link
Member

left a comment

Thanks, this looks good to me. I would slightly prefer a safe implementation since std::fmt mostly isn't geared toward performance anyway, but I am fine with this too.

@dtolnay

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

Reassigning to get one more eyeball on the unsafe code.

r? @Amanieu

These same impls already exist on char::EscapeDefault and str::EscapeDefault so I think we can land this without a full FCP, but let's @mention the libs team when this is ready to land.

@rust-highfive rust-highfive assigned Amanieu and unassigned dtolnay Aug 12, 2019

@clarfon

This comment has been minimized.

Copy link
Contributor Author

commented Aug 12, 2019

Unfortunately we don't have a u7 type for ASCII but I would rather not have to do UTF-8 checking for this. It could be used in a slightly more performant way which could help.

@Amanieu

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2019

This looks fine to me. cc @rust-lang/libs because this is an insta-stable impl.

@dtolnay

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2019

📌 Commit 51ce121 has been approved by dtolnay

Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019

Rollup merge of rust-lang#63421 - clarfon:escape_default, r=dtolnay
Implement Clone, Display for ascii::EscapeDefault

This will mimic the same behaviour as the `char` version; `Display`ing the iterator will give its string representation without advancing it.

Centril added a commit to Centril/rust that referenced this pull request Aug 13, 2019

Rollup merge of rust-lang#63421 - clarfon:escape_default, r=dtolnay
Implement Clone, Display for ascii::EscapeDefault

This will mimic the same behaviour as the `char` version; `Display`ing the iterator will give its string representation without advancing it.

@Centril Centril added this to the 1.38 milestone Aug 13, 2019

bors added a commit that referenced this pull request Aug 13, 2019

Auto merge of #63515 - Centril:rollup-r0z0yi8, r=Centril
Rollup of 11 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Aug 13, 2019

Rollup merge of rust-lang#63421 - clarfon:escape_default, r=dtolnay
Implement Clone, Display for ascii::EscapeDefault

This will mimic the same behaviour as the `char` version; `Display`ing the iterator will give its string representation without advancing it.

bors added a commit that referenced this pull request Aug 13, 2019

Auto merge of #63517 - Centril:rollup-8qbalaf, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Aug 13, 2019

Auto merge of #63517 - Centril:rollup-8qbalaf, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)

Failed merges:

r? @ghost

@Centril Centril modified the milestones: 1.38, 1.39 Aug 13, 2019

bors added a commit that referenced this pull request Aug 13, 2019

Auto merge of #63517 - Centril:rollup-8qbalaf, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Aug 13, 2019

Auto merge of #63517 - Centril:rollup-8qbalaf, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)

Failed merges:

r? @ghost

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 14, 2019

Rollup merge of rust-lang#63421 - clarfon:escape_default, r=dtolnay
Implement Clone, Display for ascii::EscapeDefault

This will mimic the same behaviour as the `char` version; `Display`ing the iterator will give its string representation without advancing it.

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63540 - Mark-Simulacrum:rollup-t0qq657, r=Mark-Simulacrum
Rollup of 11 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63470 (Utilize -Zbinary-dep-depinfo in rustbuild)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63488 (improve DiagnosticBuilder docs)
 - #63491 (Update RLS)
 - #63534 (Bump to 1.39)

Failed merges:

 - #63487 (Remove meaningless comments in src/test)

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

Rollup merge of rust-lang#63421 - clarfon:escape_default, r=dtolnay
Implement Clone, Display for ascii::EscapeDefault

This will mimic the same behaviour as the `char` version; `Display`ing the iterator will give its string representation without advancing it.

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63541 - Centril:rollup-d3q7074, r=Centril
Rollup of 16 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)
 - #63534 (Bump to 1.39)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

Rollup merge of rust-lang#63421 - clarfon:escape_default, r=dtolnay
Implement Clone, Display for ascii::EscapeDefault

This will mimic the same behaviour as the `char` version; `Display`ing the iterator will give its string representation without advancing it.

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63508 (Do not ICE when synthesizing spans falling inside unicode chars)
 - #63511 (ci: add a check for clock drift)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63517 - Centril:rollup-8qbalaf, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63508 (Do not ICE when synthesizing spans falling inside unicode chars)
 - #63511 (ci: add a check for clock drift)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)

Failed merges:

r? @ghost

@bors bors merged commit 51ce121 into rust-lang:master Aug 14, 2019

4 checks passed

pr Build #20190810.9 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.