Skip to content

fix: replace .unwrap() with .expect() on infallible calls #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arhtur007 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: replace .unwrap() with .expect() on infallible calls #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ impl Default for ReactionTiming {
// --- loading ---

fn expand_env_vars(raw: &str) -> String {
let re = Regex::new(r"\$\{(\w+)\}").unwrap();
let re = Regex::new(r"\$\{(\w+)\}").expect("env var regex literal is valid");
re.replace_all(raw, |caps: &regex::Captures| {
std::env::var(&caps[1]).unwrap_or_default()
})
Expand Down
8 changes: 5 additions & 3 deletions src/discord.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ impl EventHandler for Handler {
});
let prompt_with_sender = format!(
"<sender_context>\n{}\n</sender_context>\n\n{}",
serde_json::to_string(&sender_ctx).unwrap(),
serde_json::to_string(&sender_ctx)
.expect("sender_ctx is built from a serde_json::json! literal and cannot fail to serialize"),
prompt
);

Expand Down Expand Up @@ -500,7 +501,7 @@ fn compose_display(tool_lines: &[String], text: &str) -> String {
}

static MENTION_RE: LazyLock<regex::Regex> = LazyLock::new(|| {
regex::Regex::new(r"<@[!&]?\d+>").unwrap()
regex::Regex::new(r"<@[!&]?\d+>").expect("mention regex literal is valid")
});

fn strip_mention(content: &str) -> String {
Expand All @@ -509,7 +510,8 @@ fn strip_mention(content: &str) -> String {

fn shorten_thread_name(prompt: &str) -> String {
// Shorten GitHub URLs: https://github.com/owner/repo/issues/123 → owner/repo#123
let re = regex::Regex::new(r"https?://github\.com/([^/]+/[^/]+)/(issues|pull)/(\d+)").unwrap();
let re = regex::Regex::new(r"https?://github\.com/([^/]+/[^/]+)/(issues|pull)/(\d+)")
.expect("github url regex literal is valid");
let shortened = re.replace_all(prompt, "$1#$3");
let name: String = shortened.chars().take(40).collect();
if name.len() < shortened.len() {
Expand Down