Skip to content
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

Jump to bottom

fix(windows): update DisplayVersion on rustup self update #3770

Merged
merged 11 commits into from
Apr 21, 2024
Merged

fix(windows): update DisplayVersion on rustup self update #3770

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift click to select a range
93e93c1
refactor(self-update): extract `do_update_programs_display_version()`
rami3l Apr 12, 2024
d8aacc1
refactor(self-update): extract `get_and_parse_new_rustup_version()`
rami3l Apr 12, 2024
5c5641b
fix(self-update): run `do_update_programs_display_version()` on `run_…
rami3l Apr 12, 2024
28cd72f
feat(self-update): improve error messages on Windows
rami3l Apr 14, 2024
eba295f
fix(self-update): replace some `#[cfg(not(unix))]` usages with `#[cfg…
rami3l Apr 15, 2024
ca6a1f0
refactor(self-update): use `std::io`
rami3l Apr 21, 2024
4b9503d
refactor(self-update): extract `with_saved_global_state()`
rami3l Apr 15, 2024
0aa766f
refactor(self-update): extract `(get|restore)_reg_value()`
rami3l Apr 15, 2024
90b22e2
feat(self-update): add `with_saved_reg_value()`
rami3l Apr 21, 2024
b1d1adf
test(self-update): ensure the resolution of #3739
rami3l Apr 21, 2024
8fcb223
refactor(self-update)!: remove confusing `get_path()` impl on Unix
rami3l Apr 21, 2024
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
Prev Previous commit
Next Next commit
refactor(self-update): extract (get|restore)_reg_value()
  • Loading branch information
@rami3l
rami3l committed Apr 21, 2024
commit 0aa766ff552e96d1f6454dbb05d3d420d0297b8e
28 changes: 17 additions & 11 deletions src/cli/self_update/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 32,33 @@ pub fn with_saved_path(f: &mut dyn FnMut()) {

#[cfg(windows)]
pub fn get_path() -> io::Result<Option<RegValue>> {
let root = RegKey::predef(HKEY_CURRENT_USER);
let environment = root
.open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
.unwrap();
match environment.get_raw_value("PATH") {
get_reg_value(&RegKey::predef(HKEY_CURRENT_USER), "Environment", "PATH")
}

#[cfg(windows)]
fn restore_path(p: Option<RegValue>) {
restore_reg_value(&RegKey::predef(HKEY_CURRENT_USER), "Environment", "PATH", p)
}

#[cfg(windows)]
fn get_reg_value(root: &RegKey, subkey: &str, name: &str) -> io::Result<Option<RegValue>> {
let subkey = root.open_subkey_with_flags(subkey, KEY_READ | KEY_WRITE)?;
match subkey.get_raw_value(name) {
Ok(val) => Ok(Some(val)),
Err(ref e) if e.kind() == io::ErrorKind::NotFound => Ok(None),
Err(e) => Err(e),
}
}

#[cfg(windows)]
fn restore_path(p: Option<RegValue>) {
let root = RegKey::predef(HKEY_CURRENT_USER);
let environment = root
.open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
fn restore_reg_value(root: &RegKey, subkey: &str, name: &str, p: Option<RegValue>) {
let subkey = root
.open_subkey_with_flags(subkey, KEY_READ | KEY_WRITE)
.unwrap();
if let Some(p) = p.as_ref() {
environment.set_raw_value("PATH", p).unwrap();
subkey.set_raw_value(name, p).unwrap();
} else {
let _ = environment.delete_value("PATH");
let _ = subkey.delete_value(name);
}
}

Expand Down