Skip to content

Commit

Permalink
Use const over static for string literals (#18635)
Browse files Browse the repository at this point in the history
I noticed a few places where we were storing `&'static str`s in
`static`s instead of `const`s.

This PR updates them to use `const`.

Release Notes:

- N/A
  • Loading branch information
maxdeviant authored Oct 2, 2024
1 parent 2cd12f8 commit 167af4b
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion crates/client/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1752,7 +1752,7 @@ impl CredentialsProvider for KeychainCredentialsProvider {
}

/// prefix for the zed:// url scheme
pub static ZED_URL_SCHEME: &str = "zed";
pub const ZED_URL_SCHEME: &str = "zed";

/// Parses the given link into a Zed link.
///
Expand Down
2 changes: 1 addition & 1 deletion crates/collab/src/api/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use telemetry_events::{
};
use uuid::Uuid;

static CRASH_REPORTS_BUCKET: &str = "zed-crash-reports";
const CRASH_REPORTS_BUCKET: &str = "zed-crash-reports";

pub fn router() -> Router {
Router::new()
Expand Down
2 changes: 1 addition & 1 deletion crates/editor/src/clangd_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::lsp_ext::find_specific_language_server_in_selection;

use crate::{element::register_action, Editor, SwitchSourceHeader};

static CLANGD_SERVER_NAME: &str = "clangd";
const CLANGD_SERVER_NAME: &str = "clangd";

fn is_c_language(language: &Language) -> bool {
return language.name() == "C++".into() || language.name() == "C".into();
Expand Down
2 changes: 1 addition & 1 deletion crates/editor/src/rust_analyzer_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
ExpandMacroRecursively,
};

static RUST_ANALYZER_NAME: &str = "rust-analyzer";
const RUST_ANALYZER_NAME: &str = "rust-analyzer";

fn is_rust_language(language: &Language) -> bool {
language.name() == "Rust".into()
Expand Down
2 changes: 1 addition & 1 deletion crates/gpui/src/taffy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub struct TaffyLayoutEngine {
nodes_to_measure: FxHashMap<LayoutId, NodeMeasureFn>,
}

static EXPECT_MESSAGE: &str = "we should avoid taffy layout errors by construction if possible";
const EXPECT_MESSAGE: &str = "we should avoid taffy layout errors by construction if possible";

impl TaffyLayoutEngine {
pub fn new() -> Self {
Expand Down
4 changes: 2 additions & 2 deletions crates/task/src/vscode_format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ mod tests {

#[test]
fn can_deserialize_ts_tasks() {
static TYPESCRIPT_TASKS: &str = include_str!("../test_data/typescript.json");
const TYPESCRIPT_TASKS: &str = include_str!("../test_data/typescript.json");
let vscode_definitions: VsCodeTaskFile =
serde_json_lenient::from_str(TYPESCRIPT_TASKS).unwrap();

Expand Down Expand Up @@ -290,7 +290,7 @@ mod tests {

#[test]
fn can_deserialize_rust_analyzer_tasks() {
static RUST_ANALYZER_TASKS: &str = include_str!("../test_data/rust-analyzer.json");
const RUST_ANALYZER_TASKS: &str = include_str!("../test_data/rust-analyzer.json");
let vscode_definitions: VsCodeTaskFile =
serde_json_lenient::from_str(RUST_ANALYZER_TASKS).unwrap();
let expected = vec![
Expand Down
2 changes: 1 addition & 1 deletion crates/worktree/src/worktree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ pub enum Event {
DeletedEntry(ProjectEntryId),
}

static EMPTY_PATH: &str = "";
const EMPTY_PATH: &str = "";

impl EventEmitter<Event> for Worktree {}

Expand Down
2 changes: 1 addition & 1 deletion crates/zed/src/reliability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ async fn upload_previous_panics(
Ok::<_, anyhow::Error>(most_recent_panic)
}

static LAST_CRASH_UPLOADED: &str = "LAST_CRASH_UPLOADED";
const LAST_CRASH_UPLOADED: &str = "LAST_CRASH_UPLOADED";

/// upload crashes from apple's diagnostic reports to our server.
/// (only if telemetry is enabled)
Expand Down

0 comments on commit 167af4b

Please sign in to comment.