Wez Furlong
4466997b88
clean up blob storage on shutdown
...
The static OnceCell didn't run destructors, so shift to something
where we can explicitly trigger them to run and clean up the
temporary directory area.
2023-03-18 22:19:46 -07:00
Wez Furlong
344a41f944
use blob leases for decoded animation frames
...
This allows the decoder thread to live only long enough
to decode the full set of frames; we can then store the
leases in memory and pull them in only when there is
a cache miss.
refs: https://github.com/wez/wezterm/issues/3263
2023-03-18 21:55:57 -07:00
Wez Furlong
7cd0cc21bf
ImageDataType::File -> EncodedLease
...
Adopt the new blob lease layer to storing and referencing
image files.
This reduces the number of open files needed when
images are being displayed in the terminal.
refs: https://github.com/wez/wezterm/issues/3263
2023-03-18 20:32:49 -07:00
Wez Furlong
6c86bfba39
add wezterm-blob-leases crate
2023-03-18 20:30:47 -07:00
Wez Furlong
b27fd84e11
docs: fix video link on features page
2023-03-18 07:36:01 -07:00
Wez Furlong
2d255c2d75
fix kitty image protocol handling
...
Input data:
\e_Ga=T,f=32,s=10,v=22,c=1,r=1,m=1\e\\e_Gm=1;/xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T//P=\e\\e_Gm=1;/xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T////E////xP///8T//P=\e\\e_Gm=0\e\
There were two issues in handling this:
* We expected there to be `;payload` in the first transmission packet,
but there wasn't one, so we ignored it as ill-formed.
* The standard base64 decoder in the rust ecosystem is super strict
and rejects the "sloppy" python base64 encoder output that isn't
strictly conformant with the RFC. We need to jump through some
hoops to get it to relax and accept the input.
refs: https://github.com/wez/wezterm/issues/2716
2023-03-17 15:39:01 -07:00
Wez Furlong
203bd10d8e
handle unsupported images better
2023-03-17 13:52:43 -07:00
Wez Furlong
01c7b30247
cargo update
2023-03-17 12:02:21 -07:00
winston
a394735fa9
fix: rewrite . when fetching path in lua plugin crate
...
Closes #3194
2023-03-17 11:57:30 -07:00
Wez Furlong
761bd5a4d4
docs: restore foo.html rather than foo/index.html style URLs
2023-03-17 11:47:59 -07:00
Wez Furlong
e090eb9eae
Image decoding is now done in a bg thread
...
Continuing from the previous commit, this shifts:
* In-memory data -> temporary file
* Image decoding -> background thread
The background thread asynchronously decodes frames and
sends them to the render thread via a bounded channel.
While decoding frames, it writes them, uncompressed, to
a scratch file so that when the animation loops, it is
a very cheap operation to rewind and pull that data
from the file, without having to burn CPU to re-decode
the data from the start.
Memory usage is bounded to 4 uncompressed frames while
decoding, then 3 uncompressed frames (triple buffered)
while looping over the rest.
However, disk usage is N uncompressed frames.
refs: https://github.com/wez/wezterm/issues/3263
2023-03-17 11:41:20 -07:00
Wez Furlong
aa929a1a9b
move animation decoding from term layer to gui layer
...
This makes decoding animation frames a lazy operation, but it
comes at the cost of needing to re-decode the image from scratch
when it loops, because the image crate doesn't provide a way
to rewind its frame iterator.
That initial decode can have a significant time cost; a small
webp file consistently takes 150ms to decode, which is too
much to do inline in the render thread.
Next steps will be to move that cost off the render thread.
2023-03-17 11:41:20 -07:00
Wez Furlong
4e7eba36fb
Use mkdocs admonish for note about mux color schemes
2023-03-17 09:29:38 -07:00
Wez Furlong
587ceca98e
term: avoid breaking animated webp images when resizing
...
refs: https://github.com/wez/wezterm/issues/3258
2023-03-16 22:55:38 -07:00
Wez Furlong
97452d0ccc
term: improve readability of error message for oversized image
...
refs: https://github.com/wez/wezterm/issues/3264
2023-03-16 22:41:52 -07:00
Wez Furlong
a115fc0df7
fix iterm2 image cursor position
...
refs: https://github.com/wez/wezterm/issues/3266
2023-03-16 21:53:13 -07:00
Wez Furlong
6237668a14
pages: run only one at a time, allow them to queue up
2023-03-16 21:23:16 -07:00
Wez Furlong
6a9dfc409d
improve default hyperlink_rules. add default_hyperlink_rules()
...
refs: https://github.com/wez/wezterm/issues/928
2023-03-16 20:44:15 -07:00
Wez Furlong
c093b8861a
rustfmt
2023-03-16 18:13:30 -07:00
Wez Furlong
c2cf376d8f
fix DisableDefaultAssignment not working for CTRL|SHIFT P
...
refs: https://github.com/wez/wezterm/issues/3262
2023-03-16 18:08:37 -07:00
Wez Furlong
88e53a5f11
apply reloaded config to all panes, regardless of zoom state
...
refs: https://github.com/wez/wezterm/issues/3259
2023-03-16 09:31:32 -07:00
Wez Furlong
4576f46828
Set minimum animation frame duration to match max_fps
...
In #3260 , the candidate animation had a frame delay of 1ms. That is
problematic because there is no hope for wezterm running at 60fps (a
frame delay of ~16ms) to render that without dropping frames.
A consequence of such a short frame delay, coupled with the way that
images are carved up into cells, is that individual cells can easily
become visibled de-synchronized from their neighbors and results in what
looks like mpeg artifacts but are really regions where the cells are a
few frames ahead/behind their neighbors.
The solution is to clamp the frame duration up to match the minimum
displayable frame duration as governed by max_fps.
refs: https://github.com/wez/wezterm/issues/3260
2023-03-16 09:06:59 -07:00
Artyom Nesterenko
d84ccf126e
Update Homebrew section
2023-03-16 08:02:46 -07:00
Yuta Katayama
6a012cfc9f
docs: Correct to new URL
2023-03-16 08:00:28 -07:00
Jalil David Salamé Messina
cb9dc3a800
fix(clippy): Remove unnecessary clone/to_string calls
2023-03-16 07:40:12 -07:00
Wez Furlong
a22e6fa1ab
fix trigger paths!
2023-03-16 00:05:00 -07:00
Wez Furlong
4f48f03ab9
revise fmt workflow triggers
2023-03-15 23:43:32 -07:00
Wez Furlong
46913b7822
ci: adjust wezterm-ssh triggers
2023-03-15 23:43:32 -07:00
Wez Furlong
914ad42743
revise verify-pages triggers and workflow
2023-03-15 23:43:28 -07:00
Wez Furlong
cf74e7f501
ci: adjust termwiz workflow path triggers
2023-03-15 23:26:32 -07:00
Wez Furlong
f80376b9f6
docs: changelog for https://github.com/wez/wezterm/pull/3146
2023-03-15 23:16:14 -07:00
Jared Baur
2408367e6f
Improve XDG configuration searching
...
In addition to XDG_CONFIG_HOME, use XDG_CONFIG_DIRS
(https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html )
to append paths for searching for configuration files.
2023-03-15 23:11:02 -07:00
Bilal Mahmoud
78e8d90e64
fix: typo about parameter
2023-03-15 22:58:59 -07:00
Wez Furlong
8489f7fd83
docs: make them build on macos again
2023-03-15 22:56:44 -07:00
Wez Furlong
5e5f816f83
add log_unknown_escape_sequences config option
2023-03-15 22:47:32 -07:00
Wez Furlong
cd89022164
docs: don't build now-unused mdbook bits
2023-03-15 21:35:27 -07:00
Wez Furlong
7b2330ead2
ci: workflow should run when its file is changed
2023-03-15 21:34:33 -07:00
Wez Furlong
cd6d7a9799
docs: disable instant page nav
2023-03-15 21:32:16 -07:00
Wez Furlong
532d9e6e85
ci: adjust path triggers
2023-03-15 21:31:46 -07:00
Wez Furlong
107bcf6a89
docs: some adjustments for mkdocs
2023-03-15 20:54:02 -07:00
Wez Furlong
4770b38737
docs: switch doc build to Material for MkDocs
...
It's a more mature and actively developed toolset for
technical writing, and looks nicer.
2023-03-15 19:22:51 -07:00
Wez Furlong
2bfb29f1be
improve handling of animated webp images
...
Use mainline image crate to avoid an otherwise unavoidable panic
in the upstream: https://github.com/image-rs/image/issues/1775
Explicitly operate on the frames from the animation.
refs: https://github.com/wez/wezterm/issues/3250
2023-03-15 11:34:47 -07:00
Jalil David Salamé Messina
c6dc38b7f3
fix(clippy): Derive Default where possible
2023-03-15 10:21:11 -07:00
Wez Furlong
fc656c03fe
Apply suggestions from code review
2023-03-14 06:58:22 -07:00
Wez Furlong
0e193bf373
Update docs/shell-integration.md
...
Co-authored-by: Benoit de Chezelles <bew@users.noreply.github.com>
2023-03-14 06:58:22 -07:00
Peter Wagner Sandoval Moreno
e3446316fd
Add function for users powershell + starship
...
References:
Similar script for wt
https://learn.microsoft.com/en-us/windows/terminal/tutorials/new-tab-same-directory#powershell-with-posh-git
Custom pre-prompt in starship
https://starship.rs/advanced-config/#custom-pre-prompt-and-pre-execution-commands-in-powershell
2023-03-14 06:58:22 -07:00
Waleed Khan
4afedd626d
build(pty): don't use std::os::fd::RawFd symbol directly
...
For whatever reason, `portable-pty` doesn't build until Rust v1.66 due to a failure to import `std::os::fd::RawFd`. According to `cargo-msrv`:
```
$ cargo msrv --linear
Fetching index
Determining the Minimum Supported Rust Version (MSRV) for toolchain aarch64-apple-darwin
Using check command cargo check
⠲ Checking 1.68.0 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
⠴ Checking 1.68.0 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
Check for toolchain '1.68.0-aarch64-apple-darwin' succeeded
Check for toolchain '1.67.1-aarch64-apple-darwin' succeeded
Check for toolchain '1.66.1-aarch64-apple-darwin' succeeded
Check for toolchain '1.65.0-aarch64-apple-darwin' failed with:
┌───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
│ Compiling libc v0.2.139 │
│ Compiling autocfg v1.1.0 │
│ Checking cfg-if v1.0.0 │
│ Compiling proc-macro2 v1.0.51 │
│ Compiling quote v1.0.23 │
│ Compiling syn v1.0.109 │
│ Compiling unicode-ident v1.0.8 │
│ Compiling version_check v0.9.4 │
│ Compiling pkg-config v0.3.26 │
│ Compiling memchr v2.5.0 │
│ Checking bitflags v1.3.2 │
│ Checking once_cell v1.17.1 │
│ Compiling log v0.4.17 │
│ Compiling num-traits v0.2.15 │
│ Compiling futures-core v0.3.26 │
│ Compiling crossbeam-utils v0.8.15 │
│ Compiling serde_derive v1.0.152 │
│ Compiling thiserror v1.0.39 │
│ Compiling serde v1.0.152 │
│ Compiling jobserver v0.1.26 │
│ Checking pin-project-lite v0.2.9 │
│ Compiling cc v1.0.79 │
│ Checking getrandom v0.2.8 │
│ Checking scopeguard v1.1.0 │
│ Compiling ahash v0.7.6 │
│ Checking futures-sink v0.3.26 │
│ Checking futures-io v0.3.26 │
│ Compiling slab v0.4.8 │
│ Checking lazy_static v1.4.0 │
│ Compiling lock_api v0.4.9 │
│ Checking smallvec v1.10.0 │
│ Checking num_cpus v1.15.0 │
│ Compiling num-integer v0.1.45 │
│ Compiling siphasher v0.3.10 │
│ Compiling rand_core v0.6.4 │
│ Checking fastrand v1.9.0 │
│ Compiling rand v0.8.5 │
│ Compiling phf_shared v0.11.1 │
│ Compiling memoffset v0.8.0 │
│ Checking adler v1.0.2 │
│ Checking pin-utils v0.1.0 │
│ Compiling indexmap v1.9.2 │
│ Compiling futures-channel v0.3.26 │
│ Compiling libz-sys v1.1.8 │
│ Compiling anyhow v1.0.69 │
│ Checking hashbrown v0.12.3 │
│ Compiling phf_generator v0.11.1 │
│ Compiling futures-task v0.3.26 │
│ Checking miniz_oxide v0.6.2 │
│ Checking socket2 v0.4.9 │
│ Compiling crossbeam-epoch v0.9.14 │
│ Compiling futures-util v0.3.26 │
│ Compiling crc32fast v1.3.2 │
│ Checking strsim v0.10.0 │
│ Checking crossbeam-channel v0.5.7 │
│ Checking fnv v1.0.7 │
│ Compiling typenum v1.16.0 │
│ Compiling memoffset v0.6.5 │
│ Checking event-listener v2.5.3 │
│ Checking byteorder v1.4.3 │
│ Checking concurrent-queue v2.1.0 │
│ Checking parking v2.0.0 │
│ Compiling rayon-core v1.11.0 │
│ Checking waker-fn v1.1.0 │
│ Checking async-lock v2.7.0 │
│ Checking futures-lite v1.12.0 │
│ Checking signal-hook-registry v1.4.1 │
│ Checking crossbeam-deque v0.8.3 │
│ Compiling generic-array v0.14.6 │
│ Checking flate2 v1.0.25 │
│ Checking spin v0.9.5 │
│ Checking nanorand v0.7.0 │
│ Checking aho-corasick v0.7.20 │
│ Compiling polling v2.5.2 │
│ Checking regex-syntax v0.6.28 │
│ Compiling ucd-trie v0.1.5 │
│ Checking either v1.8.1 │
│ Compiling phf_codegen v0.11.1 │
│ Compiling lua-src v544.0.1 │
│ Compiling luajit-src v210.4.5+resty2cf5186 │
│ Compiling nom v5.1.2 │
│ Compiling num-rational v0.4.1 │
│ Checking rayon v1.7.0 │
│ Compiling async-io v1.12.0 │
│ Checking weezl v0.1.7 │
│ Checking regex-automata v0.1.10 │
│ Checking async-task v4.3.0 │
│ Checking simd-adler32 v0.3.4 │
│ Compiling core-foundation-sys v0.8.3 │
│ Checking base64 v0.21.0 │
│ Checking tinyvec_macros v0.1.1 │
│ Checking rustc-hash v1.1.0 │
│ Checking lab v0.11.0 │
│ Compiling tinyvec v1.6.0 │
│ Checking zune-inflate v0.2.50 │
│ Compiling mlua v0.8.8 │
│ Checking regex v1.7.1 │
│ Compiling terminfo v0.7.5 │
│ Checking png v0.17.7 │
│ Checking threadpool v1.8.1 │
│ Checking dirs-sys v0.3.7 │
│ Checking percent-encoding v2.2.0 │
│ Checking half v2.2.1 │
│ Checking lebe v0.5.2 │
│ Checking color_quant v1.1.0 │
│ Checking bit_field v0.10.2 │
│ Checking form_urlencoded v1.1.0 │
│ Checking gif v0.11.4 │
│ Checking unicode-normalization v0.1.22 │
│ Checking dirs v4.0.0 │
│ Checking jpeg-decoder v0.3.0 │
│ Checking block-buffer v0.9.0 │
│ Checking digest v0.9.0 │
│ Checking async-channel v1.8.0 │
│ Checking phf_shared v0.10.0 │
│ Compiling libgit2-sys v0.14.2+1.5.1 │
│ Checking cpufeatures v0.2.5 │
│ Checking unicode-bidi v0.3.10 │
│ Checking utf8parse v0.2.0 │
│ Checking opaque-debug v0.3.0 │
│ Compiling thiserror-impl v1.0.39 │
│ Compiling futures-macro v0.3.26 │
│ Compiling wezterm-dynamic-derive v0.1.0 (/Users/waleed/Workspace/wezterm/wezterm-dynamic/derive) │
│ Compiling bytemuck_derive v1.4.0 │
│ Compiling phf_macros v0.11.1 │
│ Compiling pin-project-internal v1.0.12 │
│ Checking tiff v0.8.1 │
│ Compiling signal-hook v0.3.15 │
│ Checking deltae v0.3.0 │
│ Checking scoped_threadpool v0.1.9 │
│ Checking atomic-waker v1.1.0 │
│ Checking blocking v1.3.0 │
│ Checking bytemuck v1.13.1 │
│ Checking phf v0.11.1 │
│ Compiling idna v0.3.0 │
│ Checking csscolorparser v0.6.2 │
│ Checking pin-project v1.0.12 │
│ Checking filedescriptor v0.8.2 (/Users/waleed/Workspace/wezterm/filedescriptor) │
│ Compiling pest v2.5.6 │
│ Checking flume v0.10.14 │
│ Checking sha2 v0.9.9 │
│ Checking exr v1.5.3 │
│ Checking vtparse v0.6.2 (/Users/waleed/Workspace/wezterm/vtparse) │
│ Compiling num-derive v0.3.3 │
│ Checking phf v0.10.1 │
│ Checking nix v0.24.3 │
│ Checking signal-hook v0.1.17 │
│ Checking termios v0.3.3 │
│ Checking serial-core v0.4.0 │
│ Checking ioctl-rs v0.1.6 │
│ Checking termios v0.2.2 │
│ Compiling async-net v1.7.0 │
│ Checking semver-parser v0.10.2 │
│ Compiling async-process v1.6.0 │
│ Compiling pest_meta v2.5.6 │
│ Compiling async-fs v1.6.0 │
│ Checking semver v0.11.0 │
│ Checking memmem v0.1.1 │
│ Checking unicode-segmentation v1.10.1 │
│ Checking finl_unicode v1.2.0 │
│ Checking fixedbitset v0.4.2 │
│ Checking hex v0.4.3 │
│ Checking same-file v1.0.6 │
│ Checking walkdir v2.3.2 │
│ Checking serial-unix v0.4.0 │
│ Compiling pest_generator v2.5.6 │
│ Checking url v2.3.1 │
│ Checking image v0.24.5 │
│ Checking async-executor v1.5.0 │
│ Checking bstr v0.2.17 │
│ Compiling miniz_oxide v0.4.4 │
│ Checking serial v0.4.0 │
│ Checking nix v0.25.1 │
│ Checking euclid v0.22.7 │
│ Checking dirs-sys-next v0.1.2 │
│ Checking filetime v0.2.20 │
│ Checking winnow v0.3.4 │
│ Checking downcast-rs v1.2.0 │
│ Checking shell-words v1.1.0 │
│ Checking dirs-next v2.0.0 │
│ Checking smol v1.3.0 │
│ Checking lru v0.7.8 │
│ Checking fsevent-sys v4.1.0 │
│ Checking match_cfg v0.1.0 │
│ Compiling pest_derive v2.5.6 │
│ Checking promise v0.2.0 (/Users/waleed/Workspace/wezterm/promise) │
│ Checking hostname v0.3.1 │
│ Checking notify v5.1.0 │
│ Checking colorgrad v0.6.2 │
│ Compiling enum-display-derive v0.1.1 │
│ Compiling wezterm-config-derive v0.1.0 (/Users/waleed/Workspace/wezterm/config/derive) │
│ Checking umask v0.1.0 (/Users/waleed/Workspace/wezterm/umask) │
│ Checking shlex v1.1.0 │
│ Compiling openssl-src v300.0.12+3.0.8 │
│ Checking foreign-types-shared v0.1.1 │
│ Checking itoa v1.0.6 │
│ Checking foreign-types v0.3.2 │
│ Compiling io-lifetimes v1.0.5 │
│ Compiling rustix v0.36.9 │
│ Checking errno v0.2.8 │
│ Compiling openssl-sys v0.9.71 │
│ Checking ordered-float v3.4.0 │
│ Checking toml_datetime v0.6.1 │
│ Checking serde_spanned v0.6.1 │
│ Compiling objc_exception v0.1.2 │
│ Checking wezterm-dynamic v0.1.0 (/Users/waleed/Workspace/wezterm/wezterm-dynamic) │
│ Checking toml_edit v0.19.4 │
│ Checking portable-pty v0.8.0 (/Users/waleed/Workspace/wezterm/pty) │
│ error[E0412]: cannot find type `RawFd` in `std::os::fd` │
│ --> pty/src/unix.rs:326:48 │
│ | │
│ 326 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> { │
│ | ^^^^^ not found in `std::os::fd` │
│ | │
│ help: consider importing this type alias │
│ | │
│ 3 | use std::os::unix::prelude::RawFd; │
│ | │
│ help: if you import `RawFd`, refer to it directly │
│ | │
│ 326 - fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> { │
│ 326 + fn as_raw_fd(&self) -> Option<RawFd> { │
│ | │
│ │
│ error[E0412]: cannot find type `RawFd` in `std::os::fd` │
│ --> pty/src/serial.rs:245:48 │
│ | │
│ 245 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> { │
│ | ^^^^^ not found in `std::os::fd` │
│ | │
│ help: consider importing this type alias │
│ | │
│ 8 | use std::os::unix::prelude::RawFd; │
│ | │
│ help: if you import `RawFd`, refer to it directly │
│ | │
│ 245 - fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> { │
│ 245 + fn as_raw_fd(&self) -> Option<RawFd> { │
│ | │
│ │
│ error[E0412]: cannot find type `RawFd` in `std::os::fd` │
│ --> pty/src/lib.rs:114:48 │
│ | │
│ 114 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd>; │
│ | ^^^^^ not found in `std::os::fd` │
│ | │
│ help: consider importing this type alias │
│ | │
│ 40 | use std::os::unix::prelude::RawFd; │
│ | │
│ help: if you import `RawFd`, refer to it directly │
│ | │
│ 114 - fn as_raw_fd(&self) -> Option<std::os::fd::RawFd>; │
│ 114 + fn as_raw_fd(&self) -> Option<RawFd>; │
│ | │
│ │
│ error[E0603]: module `fd` is private │
│ --> pty/src/unix.rs:326:44 │
│ | │
│ 326 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> { │
│ | ^^ private module │
│ | │
│ note: the module `fd` is defined here │
│ │
│ error[E0603]: module `fd` is private │
│ --> pty/src/serial.rs:245:44 │
│ | │
│ 245 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> { │
│ | ^^ private module │
│ | │
│ note: the module `fd` is defined here │
│ │
│ error[E0603]: module `fd` is private │
│ --> pty/src/lib.rs:114:44 │
│ | │
│ 114 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd>; │
│ | ^^ private module │
│ | │
│ note: the module `fd` is defined here │
│ │
│ Checking wezterm-color-types v0.2.0 (/Users/waleed/Workspace/wezterm/color-types) │
│ Checking wezterm-bidi v0.2.2 (/Users/waleed/Workspace/wezterm/bidi) │
│ Some errors have detailed explanations: E0412, E0603. │
│ For more information about an error, try `rustc --explain E0412`. │
│ error: could not compile `portable-pty` due to 6 previous errors │
│ warning: build failed, waiting for other jobs to finish... │
└───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
Finished The MSRV is: 1.66.1 ██████████████████████████████████████████████████████████████████████████████████████████████ 00:05:30
```
However, the issue is simple to work around: just don't use the symbol `std::os::fd::RawFd` directly. This commit:
1) changes the interface to use a new exported symbol `RawFd` from the `crate::unix` module;
2) imports `std::os::unix::io::RawFd` instead of `std::os::fd::RawFd` as the symbol exported from `crate::unix`.
Doing so fixes the build in earlier versions of Rust:
```
$ cargo +1.63.0 check -p portable-pty --all-targets
Checking portable-pty v0.8.0 (/Users/waleed/Workspace/wezterm/pty)
error[E0412]: cannot find type `RawFd` in `std::os::fd`
--> pty/src/unix.rs:326:48
|
326 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> {
| ^^^^^ not found in `std::os::fd`
|
help: consider importing this type alias
|
3 | use std::os::unix::prelude::RawFd;
|
help: if you import `RawFd`, refer to it directly
|
326 - fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> {
326 + fn as_raw_fd(&self) -> Option<RawFd> {
|
error[E0412]: cannot find type `RawFd` in `std::os::fd`
--> pty/src/serial.rs:245:48
|
245 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> {
| ^^^^^ not found in `std::os::fd`
|
help: consider importing this type alias
|
8 | use std::os::unix::prelude::RawFd;
|
help: if you import `RawFd`, refer to it directly
|
245 - fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> {
245 + fn as_raw_fd(&self) -> Option<RawFd> {
|
error[E0412]: cannot find type `RawFd` in `std::os::fd`
--> pty/src/lib.rs:114:48
|
114 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd>;
| ^^^^^ not found in `std::os::fd`
|
help: consider importing this type alias
|
40 | use std::os::unix::prelude::RawFd;
|
help: if you import `RawFd`, refer to it directly
|
114 - fn as_raw_fd(&self) -> Option<std::os::fd::RawFd>;
114 + fn as_raw_fd(&self) -> Option<RawFd>;
|
error[E0603]: module `fd` is private
--> pty/src/unix.rs:326:44
|
326 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> {
| ^^ private module
|
note: the module `fd` is defined here
error[E0603]: module `fd` is private
--> pty/src/serial.rs:245:44
|
245 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd> {
| ^^ private module
|
note: the module `fd` is defined here
error[E0603]: module `fd` is private
--> pty/src/lib.rs:114:44
|
114 | fn as_raw_fd(&self) -> Option<std::os::fd::RawFd>;
| ^^ private module
|
note: the module `fd` is defined here
Some errors have detailed explanations: E0412, E0603.
For more information about an error, try `rustc --explain E0412`.
error: could not compile `portable-pty` due to 6 previous errors
warning: build failed, waiting for other jobs to finish...
error: could not compile `portable-pty` due to 6 previous errors
$ cargo +1.63.0 check -p portable-pty --all-targets
Finished dev [unoptimized + debuginfo] target(s) in 0.17s
```
2023-03-12 20:48:01 -07:00
Wez Furlong
4b2973a9d4
deps: open -> 4.0
2023-03-12 20:37:58 -07:00
Wez Furlong
5c4a84726e
wezterm-ssh: fix leaky tests, as described in https://nexte.st/book/leaky-tests.html
2023-03-12 20:34:37 -07:00
Wez Furlong
0d231f6fe4
cargo update
2023-03-12 20:22:05 -07:00
