Skip to content

Commit

Permalink
Revert "Show list of enabled feature with rerun --version (#7744)"
Browse files Browse the repository at this point in the history
This reverts commit 5325fd8.
  • Loading branch information
emilk committed Oct 16, 2024
1 parent 522997c commit 30fdbd2
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 59 deletions.
2 changes: 0 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5942,8 +5942,6 @@ dependencies = [
"indicatif",
"itertools 0.13.0",
"parking_lot",
"re_build_info",
"re_build_tools",
"re_log",
"re_mp4",
"re_rav1d",
Expand Down
9 changes: 0 additions & 9 deletions crates/build/re_build_info/src/build_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ pub struct BuildInfo {
/// `CARGO_PKG_NAME`
pub crate_name: &'static str,

/// Space-separated names of all features enabled for this crate.
pub features: &'static str,

/// Crate version, parsed from `CARGO_PKG_VERSION`, ignoring any `+metadata` suffix.
pub version: super::CrateVersion,

Expand Down Expand Up @@ -77,7 +74,6 @@ impl std::fmt::Display for BuildInfo {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let Self {
crate_name,
features,
version,
rustc_version,
llvm_version,
Expand All @@ -93,10 +89,6 @@ impl std::fmt::Display for BuildInfo {

write!(f, "{crate_name} {version}")?;

if !features.is_empty() {
write!(f, " ({features})")?;
}

if let Some(rustc_version) = rustc_version {
write!(f, " [{rustc_version}")?;
if let Some(llvm_version) = llvm_version {
Expand Down Expand Up @@ -155,7 +147,6 @@ impl CrateVersion {
fn crate_version_from_build_info_string() {
let build_info = BuildInfo {
crate_name: "re_build_info",
features: "default extra",
version: CrateVersion {
major: 0,
minor: 10,
Expand Down
1 change: 0 additions & 1 deletion crates/build/re_build_info/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ macro_rules! build_info {
() => {
$crate::BuildInfo {
crate_name: env!("CARGO_PKG_NAME"),
features: env!("RE_BUILD_FEATURES"),
version: $crate::CrateVersion::parse(env!("CARGO_PKG_VERSION")),
rustc_version: env!("RE_BUILD_RUSTC_VERSION"),
llvm_version: env!("RE_BUILD_LLVM_VERSION"),
Expand Down
27 changes: 0 additions & 27 deletions crates/build/re_build_tools/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,6 @@ pub fn export_build_info_vars_for_crate(crate_name: &str) {
);
}
}

set_env(
"RE_BUILD_FEATURES",
&enabled_features_of(crate_name).unwrap().join(" "),
);
}

/// ISO 8601 / RFC 3339 build time.
Expand Down Expand Up @@ -278,25 +273,3 @@ fn rust_llvm_versions() -> anyhow::Result<(String, String)> {
pub fn cargo_metadata() -> anyhow::Result<cargo_metadata::Metadata> {
Ok(cargo_metadata::MetadataCommand::new().exec()?)
}

/// Returns a list of all the enabled features of the given package.
pub fn enabled_features_of(crate_name: &str) -> anyhow::Result<Vec<String>> {
let metadata = cargo_metadata()?;

let mut features = vec![];
for package in &metadata.packages {
if package.name == crate_name {
for feature in package.features.keys() {
println!("Checking if feature is enabled: {feature:?}");
let feature_in_screaming_snake_case =
feature.to_ascii_uppercase().replace('-', "_");
if std::env::var(format!("CARGO_FEATURE_{feature_in_screaming_snake_case}")).is_ok()
{
features.push(feature.clone());
}
}
}
}

Ok(features)
}
4 changes: 0 additions & 4 deletions crates/store/re_video/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ nasm = [


[dependencies]
re_build_info.workspace = true
re_log.workspace = true
re_tracing.workspace = true

Expand All @@ -62,9 +61,6 @@ dav1d = { workspace = true, optional = true, default-features = false, features
[dev-dependencies]
indicatif.workspace = true

[build-dependencies]
re_build_tools.workspace = true


[[example]]
name = "frames"
3 changes: 0 additions & 3 deletions crates/store/re_video/build.rs

This file was deleted.

14 changes: 11 additions & 3 deletions crates/store/re_video/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ pub use self::{
time::{Time, Timescale},
};

/// Returns information about this crate
pub fn build_info() -> re_build_info::BuildInfo {
re_build_info::build_info!()
/// Which features was this crate compiled with?
pub fn features() -> Vec<&'static str> {
// TODO(emilk): is there a helper crate for this?
let mut features = vec![];
if cfg!(feature = "av1") {
features.push("av1");
}
if cfg!(feature = "nasm") {
features.push("nasm");
}
features
}
2 changes: 1 addition & 1 deletion crates/top/rerun/src/commands/entrypoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ where

if args.version {
println!("{build_info}");
println!("Video features: {}", re_video::build_info().features);
println!("Video features: {}", re_video::features().join(" "));
return Ok(0);
}

Expand Down
2 changes: 0 additions & 2 deletions crates/utils/re_analytics/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ impl Properties for re_build_info::BuildInfo {
let git_hash = self.git_hash_or_tag();
let Self {
crate_name: _,
features,
version,
rustc_version,
llvm_version,
Expand All @@ -356,7 +355,6 @@ impl Properties for re_build_info::BuildInfo {
datetime,
} = self;

event.insert("features", features);
event.insert("git_hash", git_hash);
event.insert("rerun_version", version.to_string());
event.insert("rust_version", rustc_version);
Expand Down
7 changes: 0 additions & 7 deletions crates/viewer/re_viewer/src/ui/rerun_menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ impl App {
fn about_rerun_ui(&self, frame: &eframe::Frame, ui: &mut egui::Ui) {
let re_build_info::BuildInfo {
crate_name,
features,
version,
rustc_version,
llvm_version,
Expand All @@ -139,12 +138,6 @@ impl App {
{target_triple}"
);

// It is really the features of `rerun-cli` (the `rerun` binary) that are interesting.
// For the web-viewer we get `crate_name: "re_viewer"` here, which is much less interesting.
if crate_name == "rerun-cli" && !features.is_empty() {
label += &format!("\n{crate_name} features: {features}");
}

if !rustc_version.is_empty() {
label += &format!("\nrustc {rustc_version}");
if !llvm_version.is_empty() {
Expand Down

0 comments on commit 30fdbd2

Please sign in to comment.