Skip to content

Commit 28bb68b

Browse files
build: Replace username with whoami
`username` is completely unmaintained, and it depends on `winapi`, preventing us from supporting Windows on ARM. Use `whoami` instead to get the curent user. Ref #1426
1 parent ca43a3d commit 28bb68b

File tree

4 files changed

+31
-38
lines changed

4 files changed

+31
-38
lines changed

Cargo.lock

Lines changed: 28 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ sourcemap = { version = "9.1.2", features = ["ram_bundle"] }
6868
symbolic = { version = "12.13.3", features = ["debuginfo-serde", "il2cpp"] }
6969
thiserror = "1.0.38"
7070
url = "2.3.1"
71-
username = "0.2.0"
7271
uuid = { version = "1.3.0", features = ["v4", "serde"] }
7372
walkdir = "2.3.2"
7473
which = "4.4.0"
74+
whoami = "1.5.2"
7575
zip = "2.4.2"
7676
data-encoding = "2.3.3"
7777
magic_string = "0.3.4"

src/commands/bash_hook.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use clap::{builder::ArgPredicate, Arg, ArgAction, ArgMatches, Command};
1010
use lazy_static::lazy_static;
1111
use regex::Regex;
1212
use sentry::protocol::{Event, Exception, Frame, Stacktrace, User, Value};
13-
use username::get_user_name;
1413
use uuid::Uuid;
1514

1615
use crate::commands::send_event;
@@ -92,7 +91,7 @@ fn send_event(
9291
environment: config.get_environment().map(Into::into),
9392
release: release.or(detect_release_name().ok()).map(Into::into),
9493
sdk: Some(get_sdk_info()),
95-
user: get_user_name().ok().map(|n| User {
94+
user: whoami::fallible::username().ok().map(|n| User {
9695
username: Some(n),
9796
ip_address: Some(Default::default()),
9897
..Default::default()

src/commands/send_event.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use sentry::protocol::{Event, Level, LogEntry, User};
1313
use sentry::types::Uuid;
1414
use sentry::{apply_defaults, Client, ClientOptions, Envelope};
1515
use serde_json::Value;
16-
use username::get_user_name;
1716

1817
use crate::api::envelopes_api::EnvelopesApi;
1918
use crate::constants::USER_AGENT;
@@ -307,7 +306,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
307306
user.ip_address.get_or_insert(Default::default());
308307
event.user = Some(user);
309308
} else {
310-
event.user = get_user_name().ok().map(|n| User {
309+
event.user = whoami::fallible::username().ok().map(|n| User {
311310
username: Some(n),
312311
ip_address: Some(Default::default()),
313312
..Default::default()

0 commit comments

Comments
 (0)