-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #130236 - yaahc:unstable-feature-usage, r=estebank
unstable feature usage metrics example output ``` test-lib on master [?] is 📦 v0.1.0 via 🦀 v1.80.1 ❯ cat src/lib.rs ───────┬─────────────────────────────────────────────────────── │ File: src/lib.rs ───────┼─────────────────────────────────────────────────────── 1 │ #![feature(unix_set_mark)] 2 │ pub fn add(left: u64, right: u64) -> u64 { 3 │ left + right 4 │ } 5 │ 6 │ #[cfg(test)] 7 │ mod tests { 8 │ use super::*; 9 │ 10 │ #[test] 11 │ fn it_works() { 12 │ let result = add(2, 2); 13 │ assert_eq!(result, 4); 14 │ } 15 │ } ───────┴─────────────────────────────────────────────────────── test-lib on master [?] is 📦 v0.1.0 via 🦀 v1.80.1 ❯ cargo +stage1 rustc -- -Zmetrics-dir=$PWD/metrics Compiling test-lib v0.1.0 (/home/yaahc/tmp/test-lib) Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.08s test-lib on master [?] is 📦 v0.1.0 via 🦀 v1.80.1 ❯ cat metrics/unstable_feature_usage.json ───────┬───────────────────────────────────────────────────────────────────── │ File: metrics/unstable_feature_usage.json ───────┼───────────────────────────────────────────────────────────────────── 1 │ {"lib_features":[{"symbol":"unix_set_mark"}],"lang_features":[]} ``` related to #129485
- Loading branch information
Showing
10 changed files
with
185 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#![feature(ascii_char)] // random lib feature | ||
#![feature(box_patterns)] // random lang feature | ||
|
||
// picked arbitrary unstable features, just need a random lib and lang feature, ideally ones that | ||
// won't be stabilized any time soon so we don't have to update this test | ||
|
||
fn main() { | ||
println!("foobar"); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
//! This test checks if unstable feature usage metric dump files `unstable-feature-usage*.json` work | ||
//! as expected. | ||
//! | ||
//! - Basic sanity checks on a default ICE dump. | ||
//! | ||
//! See <https://github.com/rust-lang/rust/issues/129485>. | ||
//! | ||
//! # Test history | ||
//! | ||
//! - forked from dump-ice-to-disk test, which has flakeyness issues on i686-mingw, I'm assuming | ||
//! those will be present in this test as well on the same platform | ||
//@ ignore-windows | ||
//FIXME(#128911): still flakey on i686-mingw. | ||
|
||
use std::path::{Path, PathBuf}; | ||
|
||
use run_make_support::rfs::create_dir_all; | ||
use run_make_support::{ | ||
cwd, filename_contains, has_extension, rfs, run_in_tmpdir, rustc, serde_json, | ||
shallow_find_files, | ||
}; | ||
|
||
fn find_feature_usage_metrics<P: AsRef<Path>>(dir: P) -> Vec<PathBuf> { | ||
shallow_find_files(dir, |path| { | ||
if filename_contains(path, "unstable_feature_usage") && has_extension(path, "json") { | ||
true | ||
} else { | ||
dbg!(path); | ||
false | ||
} | ||
}) | ||
} | ||
|
||
fn main() { | ||
test_metrics_dump(); | ||
test_metrics_errors(); | ||
} | ||
|
||
#[track_caller] | ||
fn test_metrics_dump() { | ||
run_in_tmpdir(|| { | ||
let metrics_dir = cwd().join("metrics"); | ||
create_dir_all(&metrics_dir); | ||
rustc() | ||
.input("lib.rs") | ||
.env("RUST_BACKTRACE", "short") | ||
.arg(format!("-Zmetrics-dir={}", metrics_dir.display())) | ||
.run(); | ||
let mut metrics = find_feature_usage_metrics(&metrics_dir); | ||
let json_path = | ||
metrics.pop().expect("there should be one metrics file in the output directory"); | ||
|
||
// After the `pop` above, there should be no files left. | ||
assert!( | ||
metrics.is_empty(), | ||
"there should be no more than one metrics file in the output directory" | ||
); | ||
|
||
let message = rfs::read_to_string(json_path); | ||
let parsed: serde_json::Value = | ||
serde_json::from_str(&message).expect("metrics should be dumped as json"); | ||
let expected = serde_json::json!( | ||
{ | ||
"lib_features":[{"symbol":"ascii_char"}], | ||
"lang_features":[{"symbol":"box_patterns","since":null}] | ||
} | ||
); | ||
|
||
assert_eq!(expected, parsed); | ||
}); | ||
} | ||
|
||
#[track_caller] | ||
fn test_metrics_errors() { | ||
run_in_tmpdir(|| { | ||
rustc() | ||
.input("lib.rs") | ||
.env("RUST_BACKTRACE", "short") | ||
.arg("-Zmetrics-dir=invaliddirectorythatdefinitelydoesntexist") | ||
.run_fail() | ||
.assert_stderr_contains( | ||
"error: cannot dump feature usage metrics: No such file or directory", | ||
) | ||
.assert_stdout_not_contains("internal compiler error"); | ||
}); | ||
} |