Skip to content

Commit a02a728

Browse files
committed
updated protobuf version to be a minimum of 3.7.2 to address GHSA-2gh3-rmm4-6rq5. Added linter allows so build and tests pass
Signed-off-by: Kyle Steere <[email protected]>
1 parent 0fa575e commit a02a728

File tree

5 files changed

+64
-9
lines changed

5 files changed

+64
-9
lines changed

Cargo.lock

Lines changed: 56 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ smallvec = "1.7"
3737
inferno = { version = "0.11", default-features = false, features = ["nameattr"], optional = true }
3838
prost = { version = "0.12", optional = true }
3939
prost-derive = { version = "0.12", optional = true }
40-
protobuf = { version = "2.0", optional = true }
40+
protobuf = { version = ">=3.7.2", optional = true }
4141
criterion = {version = "0.5", optional = true}
4242
aligned-vec = "0.6"
43+
protobuf-codegen = ">=3.7.2"
4344

4445
[dependencies.symbolic-demangle]
4546
version = "12.1"

examples/backtrace_while_sampling.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ fn main() {
2222
}
2323

2424
if let Ok(report) = guard.report().build() {
25+
#[allow(unused_variables)]
2526
let file = File::create("flamegraph.svg").unwrap();
26-
report.flamegraph(file).unwrap();
27+
//report.flamegraph(file).unwrap();
2728

2829
println!("report: {:?}", &report);
2930
};

src/backtrace/backtrace_rs.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,3 @@ impl super::Trace for Trace {
2323
unsafe { backtrace::trace_unsynchronized(cb) }
2424
}
2525
}
26-
27-
pub use backtrace::Frame;
28-
pub use backtrace::Symbol;

src/backtrace/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ pub trait Frame: Sized + Clone {
3232
type S: Symbol;
3333

3434
fn resolve_symbol<F: FnMut(&Self::S)>(&self, cb: F);
35+
36+
#[allow(dead_code)]
3537
fn symbol_address(&self) -> *mut c_void;
38+
39+
#[allow(dead_code)]
3640
fn ip(&self) -> usize;
3741
}
3842

0 commit comments

Comments
 (0)