agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Uprev Rust toolchain pins to 1.95.0 (#24684)

Browse Source 
## Summary
- Bump the workspace Rust toolchain from `1.93.0` to `1.95.0` across
Cargo, Bazel, CI, release workflows, devcontainers, and the Codex
environment config.
- Refresh `MODULE.bazel.lock` so the Bazel Rust toolchain artifacts
match the new version.
- Leave purpose-specific toolchains unchanged, including the
`argument-comment-lint` nightly and the upstream `rusty_v8` `1.91.0`
build pin.
- Includes fixes for new lints from `just fix` and a few codex-authored
fixes for lints without a suggestion.
This commit is contained in:
Adam Perry @ OpenAI
2026-05-26 20:59:47 -07:00
committed by GitHub
parent 64e340ad28
commit cca1e0ba1d
59 changed files with 230 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/app/thread_events.rs
+4 -4
View File
@@ -104,10 +104,10 @@ impl ThreadEventStore {
ServerNotification::TurnStarted(turn) => {
self.active_turn_id = Some(turn.turn.id.clone());
}
ServerNotification::TurnCompleted(turn) => {
if self.active_turn_id.as_deref() == Some(turn.turn.id.as_str()) {
self.active_turn_id = None;
}
ServerNotification::TurnCompleted(turn)
if self.active_turn_id.as_deref() == Some(turn.turn.id.as_str()) =>
{
self.active_turn_id = None;
}
ServerNotification::ThreadClosed(_) => {
self.active_turn_id = None;
codex-rs/tui/src/bottom_pane/request_user_input/mod.rs
+3 -5
View File
@@ -1188,11 +1188,9 @@ impl BottomPaneView for RequestUserInputOverlay {
KeyCode::Backspace | KeyCode::Delete => {
self.clear_selection();
}
KeyCode::Tab => {
if self.selected_option_index().is_some() {
self.focus = Focus::Notes;
self.ensure_selected_for_notes();
}
KeyCode::Tab if self.selected_option_index().is_some() => {
self.focus = Focus::Notes;
self.ensure_selected_for_notes();
}
KeyCode::Enter => {
let has_selection = self.selected_option_index().is_some();
codex-rs/tui/src/chatwidget/protocol.rs
+2 -4
View File
@@ -332,10 +332,8 @@ impl ChatWidget {
reasoning_effort,
agents_states,
}),
ThreadItem::EnteredReviewMode { review, .. } => {
if !from_replay {
self.enter_review_mode_with_hint(review, /*from_replay*/ false);
}
ThreadItem::EnteredReviewMode { review, .. } if !from_replay => {
self.enter_review_mode_with_hint(review, /*from_replay*/ false);
}
_ => {}
}
codex-rs/tui/src/history_cell/mcp.rs
+3 -3
View File
@@ -358,7 +358,7 @@ pub(crate) fn new_mcp_tools_output(
let effective_servers = config.mcp_servers.get().clone();
let mut servers: Vec<_> = effective_servers.iter().collect();
servers.sort_by(|(a, _), (b, _)| a.cmp(b));
servers.sort_by_key(|(server, _)| *server);
for (server, cfg) in servers {
let prefix = qualified_mcp_tool_name_prefix(server);
@@ -430,7 +430,7 @@ pub(crate) fn new_mcp_tools_output(
&& !headers.is_empty()
{
let mut pairs: Vec<_> = headers.iter().collect();
pairs.sort_by(|(a, _), (b, _)| a.cmp(b));
pairs.sort_by_key(|(name, _)| *name);
let display = pairs
.into_iter()
.map(|(name, _)| format!("{name}=*****"))
@@ -442,7 +442,7 @@ pub(crate) fn new_mcp_tools_output(
&& !headers.is_empty()
{
let mut pairs: Vec<_> = headers.iter().collect();
pairs.sort_by(|(a, _), (b, _)| a.cmp(b));
pairs.sort_by_key(|(name, _)| *name);
let display = pairs
.into_iter()
.map(|(name, var)| format!("{name}={var}"))
codex-rs/tui/src/history_cell/session.rs
+1 -1
View File
@@ -58,7 +58,7 @@ fn with_border_internal(
let span_count = line.spans.len();
let mut spans: Vec<Span<'static>> = Vec::with_capacity(span_count + 4);
spans.push(Span::from("│ ").dim());
spans.extend(line.into_iter());
spans.extend(line);
if used_width < content_width {
spans.push(Span::from(" ".repeat(content_width - used_width)).dim());
}
codex-rs/tui/src/multi_agents.rs
+1 -1
View File
@@ -516,7 +516,7 @@ fn wait_complete_lines(
.then(|| (parsed_thread_id, agent_metadata(parsed_thread_id), status))
})
.collect::<Vec<_>>();
extras.sort_by(|left, right| left.0.to_string().cmp(&right.0.to_string()));
extras.sort_by_key(|entry| entry.0.to_string());
entries.extend(extras);
if entries.is_empty() {
codex-rs/tui/src/resume_picker.rs
+8 -12
View File
@@ -1159,23 +1159,21 @@ impl PickerState {
self.request_frame();
}
}
_ if allow_plain_char_navigation && self.list_keymap.jump_top.is_pressed(key) => {
if !self.filtered_rows.is_empty() {
_ if allow_plain_char_navigation && self.list_keymap.jump_top.is_pressed(key)
&& !self.filtered_rows.is_empty() => {
self.selected = 0;
self.ensure_selected_visible();
self.request_frame();
}
}
_ if allow_plain_char_navigation && self.list_keymap.jump_bottom.is_pressed(key) => {
if !self.filtered_rows.is_empty() {
_ if allow_plain_char_navigation && self.list_keymap.jump_bottom.is_pressed(key)
&& !self.filtered_rows.is_empty() => {
self.selected = self.filtered_rows.len().saturating_sub(1);
self.ensure_selected_visible();
self.maybe_load_more_for_scroll();
self.request_frame();
}
}
_ if allow_plain_char_navigation && self.list_keymap.page_down.is_pressed(key) => {
if !self.filtered_rows.is_empty() {
_ if allow_plain_char_navigation && self.list_keymap.page_down.is_pressed(key)
&& !self.filtered_rows.is_empty() => {
let step = self.view_rows.unwrap_or(10).max(1);
let target = self.selected.saturating_add(step);
let max_index = self.filtered_rows.len().saturating_sub(1);
@@ -1189,7 +1187,6 @@ impl PickerState {
}
self.request_frame();
}
}
KeyEvent {
code: KeyCode::Tab, ..
} => {
@@ -1222,16 +1219,15 @@ impl PickerState {
code: KeyCode::Char(c),
modifiers,
..
} => {
}
// basic text input for search
if !modifiers.contains(KeyModifiers::CONTROL)
&& !modifiers.contains(KeyModifiers::ALT)
{
=> {
let mut new_query = self.query.clone();
new_query.push(c);
self.set_query(new_query);
}
}
_ => {}
}
Ok(None)
codex-rs/tui/src/text_formatting.rs
+1 -1
View File
@@ -284,7 +284,7 @@ pub(crate) fn center_truncate_path(path: &str, max_width: usize) -> String {
}
};
for (left_count, right_count) in prioritized.into_iter().chain(fallback.into_iter()) {
for (left_count, right_count) in prioritized.into_iter().chain(fallback) {
let mut segments: Vec<Segment<'_>> = raw_segments[..left_count]
.iter()
.map(|seg| Segment {
codex-rs/tui/src/theme_picker.rs
+1 -3
View File
@@ -199,10 +199,9 @@ fn render_preview(
0
};
let mut y = area.y.saturating_add(top_pad);
let render_width = area.width.saturating_sub(left_pad);
let style_context = current_diff_render_style_context();
for (idx, row) in preview_rows.iter().enumerate() {
for (y, (idx, row)) in (area.y.saturating_add(top_pad)..).zip(preview_rows.iter().enumerate()) {
if y >= area.y + area.height {
break;
}
@@ -232,7 +231,6 @@ fn render_preview(
Rect::new(area.x.saturating_add(left_pad), y, render_width, 1),
buf,
);
y += 1;
}
}