Skip to content

Commit

Permalink
post-rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
teh-cmc committed Oct 25, 2023
1 parent 416cec9 commit c9f9336
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
5 changes: 1 addition & 4 deletions crates/rerun/src/clap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ impl RerunArgs {
)),

RerunBehavior::Spawn => Ok((
RecordingStreamBuilder::new(application_id).spawn(
&crate::SpawnOptions::default(),
crate::default_flush_timeout(),
)?,
RecordingStreamBuilder::new(application_id).spawn(crate::default_flush_timeout())?,
Default::default(),
)),

Expand Down
2 changes: 1 addition & 1 deletion examples/rust/dna/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const NUM_POINTS: usize = 100;

fn main() -> Result<(), Box<dyn std::error::Error>> {
let rec = rerun::RecordingStreamBuilder::new("rerun_example_dna_abacus")
.spawn(&Default::default(), rerun::default_flush_timeout())?;
.spawn(rerun::default_flush_timeout())?;

let (points1, colors1) = color_spiral(NUM_POINTS, 2.0, 0.02, 0.0, 0.1);
let (points2, colors2) = color_spiral(NUM_POINTS, 2.0, 0.02, TAU * 0.5, 0.1);
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/minimal/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use rerun::{demo_util::grid, external::glam};

fn main() -> Result<(), Box<dyn std::error::Error>> {
let rec = rerun::RecordingStreamBuilder::new("rerun_example_minimal")
.spawn(&Default::default(), rerun::default_flush_timeout())?;
.spawn(rerun::default_flush_timeout())?;

let points = grid(glam::Vec3::splat(-10.0), glam::Vec3::splat(10.0), 10);
let colors = grid(glam::Vec3::ZERO, glam::Vec3::splat(255.0), 10)
Expand Down
3 changes: 1 addition & 2 deletions tests/rust/test_image_memory/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ static GLOBAL: AccountingAllocator<MiMalloc> = AccountingAllocator::new(MiMalloc
fn main() -> Result<(), Box<dyn std::error::Error>> {
re_memory::accounting_allocator::turn_on_tracking_if_env_var("RERUN_TRACK_ALLOCATIONS");

let rec = rerun::RecordingStreamBuilder::new("test_image_memory_rs")
.spawn(&rerun::SpawnOptions::default(), None)?;
let rec = rerun::RecordingStreamBuilder::new("test_image_memory_rs").spawn(None)?;
log_images(&rec).unwrap();

Ok(())
Expand Down

0 comments on commit c9f9336

Please sign in to comment.