Skip to content

Commit 0819c21

Browse files
committed
Rename sys/interface to sys/setup
1 parent f0f4e27 commit 0819c21

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

crates/ark/src/console.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ impl Console {
630630
let libraries = RLibraries::from_r_home_path(&r_home);
631631
libraries.initialize_pre_setup_r();
632632

633-
crate::sys::interface::setup_r(&r_args);
633+
crate::sys::setup::setup_r(&r_args);
634634

635635
libraries.initialize_post_setup_r();
636636

@@ -718,7 +718,7 @@ impl Console {
718718
}
719719

720720
// Start the REPL. Does not return!
721-
crate::sys::interface::run_r();
721+
crate::sys::setup::run_r();
722722
}
723723

724724
/// Build the argument list from the command line arguments. The default
@@ -2324,7 +2324,7 @@ impl Console {
23242324
// this.
23252325
unsafe { R_ProcessEvents() };
23262326

2327-
crate::sys::interface::run_activity_handlers();
2327+
crate::sys::setup::run_activity_handlers();
23282328

23292329
// Run pending finalizers. We need to do this eagerly as otherwise finalizers
23302330
// might end up being executed on the LSP thread.

crates/ark/src/fixtures/dummy_frontend.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl DummyArkFrontend {
6969
pub fn wait_for_cleanup() {
7070
use std::time::Duration;
7171

72-
use crate::sys::interface::CLEANUP_SIGNAL;
72+
use crate::sys::setup::CLEANUP_SIGNAL;
7373

7474
let (lock, cvar) = &CLEANUP_SIGNAL;
7575
let result = cvar

crates/ark/src/sys/unix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
pub mod console;
99
pub mod control;
10-
pub mod interface;
1110
pub mod path;
11+
pub mod setup;
1212
pub mod signals;
1313
pub mod traps;
1414

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* interface.rs
2+
* setup.rs
33
*
4-
* Copyright (C) 2023 Posit Software, PBC. All rights reserved.
4+
* Copyright (C) 2023-2026 Posit Software, PBC. All rights reserved.
55
*
66
*/
77

crates/ark/src/sys/windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
pub mod console;
99
pub mod control;
10-
pub mod interface;
1110
mod locale;
1211
pub mod parent_monitor;
1312
pub mod path;
13+
pub mod setup;
1414
pub mod signals;
1515
mod strings;
1616
pub mod traps;
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* interface.rs
2+
* setup.rs
33
*
4-
* Copyright (C) 2023 Posit Software, PBC. All rights reserved.
4+
* Copyright (C) 2023-2026 Posit Software, PBC. All rights reserved.
55
*
66
*/
77

@@ -23,12 +23,12 @@ use libr::R_SignalHandlers;
2323
use libr::R_common_command_line;
2424
use libr::Rboolean_FALSE;
2525

26-
use crate::interface::r_busy;
27-
use crate::interface::r_read_console;
28-
use crate::interface::r_show_message;
29-
use crate::interface::r_suicide;
30-
use crate::interface::r_write_console;
31-
use crate::interface::Console;
26+
use crate::console::r_busy;
27+
use crate::console::r_read_console;
28+
use crate::console::r_show_message;
29+
use crate::console::r_suicide;
30+
use crate::console::r_write_console;
31+
use crate::console::Console;
3232
use crate::sys::windows::strings::system_to_utf8;
3333

3434
pub fn setup_r(args: &Vec<String>) {

0 commit comments

Comments
 (0)