Skip to content

Commit 93917d7

Browse files
committed
Make soft_error! return Ok in OSS builds and remove .unwrap() at call sites
1 parent 0ce962c commit 93917d7

4 files changed

Lines changed: 11 additions & 23 deletions

File tree

app/buck2_env/src/soft_error.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,6 @@ pub fn handle_soft_error(
291291
return Err(err.context("Upgraded warning to failure via $BUCK2_HARD_ERROR"));
292292
}
293293

294-
// @oss-disable: let is_open_source = false;
295-
let is_open_source = true; // @oss-enable
296-
if is_open_source {
297-
// We don't log these, and we have no legacy users, and they might not upgrade that often,
298-
// so lets just break open source things immediately.
299-
return Err(err);
300-
}
301-
302294
Ok(err)
303295
}
304296

app/buck2_execute_impl/src/materializers/deferred/artifact_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ impl ArtifactTree {
392392
}
393393
Err(e) => {
394394
// NOTE: This shouldn't normally happen?
395-
soft_error!("cleanup_finished_vacant", e, quiet: true).unwrap();
395+
let _unused = soft_error!("cleanup_finished_vacant", e, quiet: true);
396396
}
397397
}
398398
}

app/buck2_execute_impl/src/materializers/deferred/command_processor.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -553,12 +553,11 @@ impl<T: IoHandler> DeferredMaterializerCommandProcessor<T> {
553553
Some(cmd.create_clean_fut(&mut self, None, daemon_id));
554554
} else {
555555
// This should never happen
556-
soft_error!(
556+
let _unused = soft_error!(
557557
"clean_stale_no_config",
558558
buck2_error!(buck2_error::ErrorTag::Tier0, "clean scheduled without being configured"),
559559
quiet: true
560-
)
561-
.unwrap();
560+
);
562561
}
563562
}
564563
}
@@ -752,12 +751,11 @@ impl<T: IoHandler> DeferredMaterializerCommandProcessor<T> {
752751
.materializer_state_table()
753752
.update_access_times(buffer.iter().collect::<Vec<_>>())
754753
{
755-
soft_error!(
754+
let _unused = soft_error!(
756755
"materializer_materialize_error",
757756
e,
758757
quiet: true
759-
)
760-
.unwrap();
758+
);
761759
return "Found error while updating access times in sqlite db".to_owned();
762760
}
763761
}
@@ -1027,7 +1025,7 @@ impl<T: IoHandler> DeferredMaterializerCommandProcessor<T> {
10271025
.materializer_state_table()
10281026
.update_access_times(vec![&path])
10291027
{
1030-
soft_error!("has_artifact_update_time", e, quiet: true).unwrap();
1028+
let _unused = soft_error!("has_artifact_update_time", e, quiet: true);
10311029
}
10321030
}
10331031
}
@@ -1475,7 +1473,7 @@ fn on_materialization(
14751473
.materializer_state_table()
14761474
.insert(path, metadata, timestamp)
14771475
{
1478-
soft_error!(error_name, e, quiet: true).unwrap();
1476+
let _unused = soft_error!(error_name, e, quiet: true);
14791477
}
14801478
}
14811479

app/buck2_execute_impl/src/sqlite/incremental_state_db.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,15 @@ impl IncrementalDbState {
7171

7272
self.state.insert(key.to_owned(), value.clone().into());
7373
if let Err(e) = db.incremental_state_table().insert(key.to_owned(), value) {
74-
soft_error!(
74+
let _unused = soft_error!(
7575
"insert_to_incremental_db",
7676
buck2_error::buck2_error!(
7777
buck2_error::ErrorTag::Tier0,
7878
"Failed to insert {} into sqlite db. {}",
7979
key, e
8080
),
8181
quiet: true
82-
)
83-
.unwrap();
82+
);
8483
};
8584
}
8685
None => {
@@ -95,16 +94,15 @@ impl IncrementalDbState {
9594
{
9695
// This should be converted into a real error later, marking as a soft error for now as the row not existing
9796
// might show up as an error but doesn't actually matter in reality.
98-
soft_error!(
97+
let _unused = soft_error!(
9998
"delete_from_incremental_db",
10099
buck2_error::buck2_error!(
101100
buck2_error::ErrorTag::Tier0,
102101
"Failed to remove incremental path map from sqlite db. {}",
103102
e
104103
),
105104
quiet: true
106-
)
107-
.unwrap();
105+
);
108106
}
109107

110108
self.state.remove(key);

0 commit comments

Comments
 (0)