Skip to content

Conversation

@case
Copy link

@case case commented Jan 14, 2026

What does this PR try to resolve?

Per the iTerm version 3.6.6 release - "Add support for OSC 9;4 progress bars"

I added iTerm to nextest here and they suggested I add it to Cargo as well.

How to test and review this PR?

I've test this locally, but it isn't really a unit test or integration test candidate.

Here's the output from my local iTerm console:

$ echo $TERM_PROGRAM
iTerm.app

@rustbot rustbot added A-console-output Area: Terminal output, colors, progress bar, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 14, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2026

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Comment on lines +643 to +645
let iterm = std::env::var("TERM_PROGRAM").ok() == Some("iTerm.app".into());

(windows_terminal || conemu || wezterm || ghostty) && stream.is_terminal()
(windows_terminal || conemu || wezterm || ghostty || iterm) && stream.is_terminal()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do old versions gracefully ignore these escape codes?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question! I'll follow up with @gnachman about this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likely you can just do a quick check by forcing this on in older versions. The main reason this comes up is

  • For some escape code sequences, there are bugs in older versions
  • I think it was this escape sequence that partially overlapped with another one and terminals would do weird things if they didn't guard against that

@epage
Copy link
Contributor

epage commented Jan 14, 2026

Regarding CI, it was fixed in crate-ci/typos#1447, so we just need to update. I'll post a PR.

epage added a commit to epage/cargo that referenced this pull request Jan 14, 2026
@epage epage mentioned this pull request Jan 14, 2026
github-merge-queue bot pushed a commit that referenced this pull request Jan 14, 2026
### What does this PR try to resolve?

This will unblock #16506

### How to test and review this PR?
@epage
Copy link
Contributor

epage commented Jan 14, 2026

A rebase should resolve the CI failure.

@rustbot
Copy link
Collaborator

rustbot commented Jan 17, 2026

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@weihanglo
Copy link
Member

FWIW, it would be nice if we could avoid merge commits in pull requests. Feel free to rebase as needed. Keeping the history linear makes PRs easier to read and review, and ideally we’d only see a merge commit when the PR itself is merged, not merges from master along the way.

@case
Copy link
Author

case commented Jan 17, 2026

FWIW, it would be nice if we could avoid merge commits in pull requests. Feel free to rebase as needed. Keeping the history linear makes PRs easier to read and review, and ideally we’d only see a merge commit when the PR itself is merged, not merges from master along the way.

Oops, my apologies 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-console-output Area: Terminal output, colors, progress bar, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants