about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2021-04-15 01:27:53 +0200
committerGitHub <noreply@github.com>2021-04-15 01:27:53 +0200
commitd783f399e5b9366c99eb94e81dcb339722f012d4 (patch)
treea0a4a45b67b1f8e34330dfad89db25a861748073
parent80ee7cbb37424bf66a1d05a9028791ba1accb699 (diff)
parenta8fbe2f22f78a97f455808284d6893cee1ed6b35 (diff)
downloadrust-d783f399e5b9366c99eb94e81dcb339722f012d4.tar.gz
rust-d783f399e5b9366c99eb94e81dcb339722f012d4.zip
Rollup merge of #84177 - ehuss:join_paths-err, r=kennytm
Fix join_paths error display.

On unix, the error from `join_paths` looked like this:

```
path segment contains separator `58`
```

This PR changes it to look like this:

```
path segment contains separator `:`
```
-rw-r--r--library/std/src/sys/unix/os.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/unix/os.rs b/library/std/src/sys/unix/os.rs
index 4a077e2151e..ce2c4e88c7e 100644
--- a/library/std/src/sys/unix/os.rs
+++ b/library/std/src/sys/unix/os.rs
@@ -223,7 +223,7 @@ where
 
 impl fmt::Display for JoinPathsError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "path segment contains separator `{}`", PATH_SEPARATOR)
+        write!(f, "path segment contains separator `{}`", char::from(PATH_SEPARATOR))
     }
 }