Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mikayla-maki committed Mar 9, 2024
1 parent ab4a723 commit 2d9ab5b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
7 changes: 3 additions & 4 deletions crates/gpui/src/platform/linux/platform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ impl Platform for LinuxPlatform {
})
}

//TODO linux
//todo(linux)
fn app_path(&self) -> Result<PathBuf> {
Err(anyhow::Error::msg(
"Platform<LinuxPlatform>::app_path is not implemented yet",
Expand All @@ -338,7 +338,7 @@ impl Platform for LinuxPlatform {
UtcOffset::UTC
}

//TODO linux
//todo(linux)
fn path_for_auxiliary_executable(&self, name: &str) -> Result<PathBuf> {
Err(anyhow::Error::msg(
"Platform<LinuxPlatform>::path_for_auxiliary_executable is not implemented yet",
Expand Down Expand Up @@ -390,8 +390,7 @@ impl Platform for LinuxPlatform {
})
}

//TODO linux: add trait methods for accessing the primary selection

//todo(linux): add trait methods for accessing the primary selection
fn read_credentials(&self, url: &str) -> Task<Result<Option<(String, Vec<u8>)>>> {
let url = url.to_string();
self.background_executor().spawn(async move {
Expand Down
2 changes: 1 addition & 1 deletion crates/gpui/src/platform/linux/wayland/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ impl Client for WaylandClient {
CursorStyle::ResizeUp => "n-resize".to_string(),
CursorStyle::ResizeDown => "s-resize".to_string(),
CursorStyle::ResizeUpDown => "ns-resize".to_string(),
CursorStyle::DisappearingItem => "grabbing".to_string(), // TODO linux - couldn't find equivalent icon in linux
CursorStyle::DisappearingItem => "grabbing".to_string(), // todo(linux) - couldn't find equivalent icon in linux
CursorStyle::IBeamCursorForVerticalLayout => "vertical-text".to_string(),
CursorStyle::OperationNotAllowed => "not-allowed".to_string(),
CursorStyle::DragLink => "dnd-link".to_string(),
Expand Down
2 changes: 1 addition & 1 deletion crates/gpui/src/platform/linux/x11/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ impl Client for X11Client {
Box::new(X11Window(window_ptr))
}

// TODO linux
//todo(linux)
fn set_cursor_style(&self, _style: CursorStyle) {}

fn get_clipboard(&self) -> Rc<RefCell<dyn ClipboardProvider>> {
Expand Down
6 changes: 2 additions & 4 deletions tooling/xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ fn run_clippy(args: ClippyArgs) -> Result<()> {
clippy_command.arg("--workspace");
}

clippy_command
.arg("--release")
.arg("--all-targets")
.arg("--all-features");
clippy_command.arg("--release").arg("--all-features");

if args.fix {
clippy_command.arg("--fix");
Expand All @@ -60,6 +57,7 @@ fn run_clippy(args: ClippyArgs) -> Result<()> {

// Deny all warnings.
// We don't do this yet on Windows, as it still has some warnings present.
// todo(windows)
#[cfg(not(target_os = "windows"))]
clippy_command.args(["--deny", "warnings"]);

Expand Down

0 comments on commit 2d9ab5b

Please sign in to comment.