mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-09-07 20:02:17 +02:00
Fix Windows terminal links
This commit is contained in:
parent
7a74a72dc8
commit
f6cf6c611c
@ -35,7 +35,7 @@ The following command will download and compile Rustlings:
|
||||
<!-- TODO: Remove @6.0.0-beta.x -->
|
||||
|
||||
```bash
|
||||
cargo install rustlings@6.0.0-beta.7
|
||||
cargo install rustlings@6.0.0-beta.8
|
||||
```
|
||||
|
||||
<details>
|
||||
@ -44,7 +44,7 @@ cargo install rustlings@6.0.0-beta.7
|
||||
<!-- TODO: Remove @6.0.0-beta.x -->
|
||||
|
||||
- Make sure you have the latest Rust version by running `rustup update`
|
||||
- Try adding the `--locked` flag: `cargo install rustlings@6.0.0-beta.7 --locked`
|
||||
- Try adding the `--locked` flag: `cargo install rustlings@6.0.0-beta.8 --locked`
|
||||
- Otherwise, please [report the issue](https://github.com/rust-lang/rustlings/issues/new)
|
||||
|
||||
</details>
|
||||
|
@ -7,15 +7,18 @@ pub struct TerminalFileLink<'a>(pub &'a str);
|
||||
|
||||
impl<'a> Display for TerminalFileLink<'a> {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
|
||||
if let Ok(Some(canonical_path)) = fs::canonicalize(self.0)
|
||||
.as_deref()
|
||||
.map(|path| path.to_str())
|
||||
{
|
||||
write!(
|
||||
f,
|
||||
"\x1b]8;;file://{}\x1b\\{}\x1b]8;;\x1b\\",
|
||||
canonical_path, self.0,
|
||||
)
|
||||
let path = fs::canonicalize(self.0);
|
||||
|
||||
if let Some(path) = path.as_deref().ok().and_then(|path| path.to_str()) {
|
||||
// Windows itself can't handle its verbatim paths.
|
||||
#[cfg(windows)]
|
||||
let path = if path.len() > 5 && &path[0..4] == r"\\?\" {
|
||||
&path[4..]
|
||||
} else {
|
||||
path
|
||||
};
|
||||
|
||||
write!(f, "\x1b]8;;file://{path}\x1b\\{}\x1b]8;;\x1b\\", self.0)
|
||||
} else {
|
||||
write!(f, "{}", self.0)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user