-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
fix(self-update): add missing functions to self_update stub #6502
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,49 @@ | ||
| use std::collections::BTreeMap; | ||
| use std::fs; | ||
| use std::path::PathBuf; | ||
|
|
||
| use crate::env; | ||
|
|
||
| pub struct SelfUpdate {} | ||
|
|
||
| impl SelfUpdate { | ||
| pub fn is_available() -> bool { | ||
| false | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Default, serde::Deserialize)] | ||
| struct InstructionsToml { | ||
| message: Option<String>, | ||
| #[serde(flatten)] | ||
| commands: BTreeMap<String, String>, | ||
| } | ||
|
|
||
| fn read_instructions_file(path: &PathBuf) -> Option<String> { | ||
| let body = fs::read_to_string(path).ok()?; | ||
| let parsed: InstructionsToml = toml::from_str(&body).ok()?; | ||
| if let Some(msg) = parsed.message { | ||
| return Some(msg); | ||
| } | ||
| if let Some((_k, v)) = parsed.commands.into_iter().next() { | ||
| return Some(v); | ||
| } | ||
| None | ||
| } | ||
|
|
||
| pub fn upgrade_instructions_text() -> Option<String> { | ||
| if let Some(path) = &*env::MISE_SELF_UPDATE_INSTRUCTIONS { | ||
| if let Some(msg) = read_instructions_file(path) { | ||
| return Some(msg); | ||
| } | ||
| } | ||
| None | ||
| } | ||
|
|
||
| pub fn append_self_update_instructions(mut message: String) -> String { | ||
| if let Some(instructions) = upgrade_instructions_text() { | ||
| message.push('\n'); | ||
| message.push_str(&instructions); | ||
| } | ||
| message | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Stub Function Performs Unnecessary I/O Operations
The
upgrade_instructions_text()function in theself_update_stubmodule reads and parses a TOML file. As a stub for a disabled feature, it's expected to be a no-op and returnNonedirectly. This current behavior introduces unnecessary file I/O and TOML parsing dependencies, potentially leading to runtime errors when theself_updatefeature is not enabled.