mirror of https://github.com/rust-lang/rust.git
Auto merge of #93655 - matthiaskrgr:rollup-dm88b02, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #90132 (Stabilize `-Z instrument-coverage` as `-C instrument-coverage`) - #91589 (impl `Arc::unwrap_or_clone`) - #93495 (kmc-solid: Fix off-by-one error in `SystemTime::now`) - #93576 (Emit more valid HTML from rustdoc) - #93608 (Clean up `find_library_crate`) - #93612 (doc: use U+2212 for minus sign in integer MIN/MAX text) - #93615 (Fix `isize` optimization in `StableHasher` for big-endian architectures) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
bors
commit
4c55c8362d
|
|
@ -39,7 +39,7 @@ pub fn finalize<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>) {
|
|||
// LLVM 12.
|
||||
let version = coverageinfo::mapping_version();
|
||||
if version < 4 {
|
||||
tcx.sess.fatal("rustc option `-Z instrument-coverage` requires LLVM 12 or higher.");
|
||||
tcx.sess.fatal("rustc option `-C instrument-coverage` requires LLVM 12 or higher.");
|
||||
}
|
||||
|
||||
debug!("Generating coverage map for CodegenUnit: `{}`", cx.codegen_unit.name());
|
||||
|
|
@ -274,7 +274,7 @@ fn save_function_record(
|
|||
/// (functions referenced by other "used" or public items). Any other functions considered unused,
|
||||
/// or "Unreachable", were still parsed and processed through the MIR stage, but were not
|
||||
/// codegenned. (Note that `-Clink-dead-code` can force some unused code to be codegenned, but
|
||||
/// that flag is known to cause other errors, when combined with `-Z instrument-coverage`; and
|
||||
/// that flag is known to cause other errors, when combined with `-C instrument-coverage`; and
|
||||
/// `-Clink-dead-code` will not generate code for unused generic functions.)
|
||||
///
|
||||
/// We can find the unused functions (including generic functions) by the set difference of all MIR
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ pub trait CoverageInfoMethods<'tcx>: BackendTypes {
|
|||
|
||||
pub trait CoverageInfoBuilderMethods<'tcx>: BackendTypes {
|
||||
/// Returns true if the function source hash was added to the coverage map (even if it had
|
||||
/// already been added, for this instance). Returns false *only* if `-Z instrument-coverage` is
|
||||
/// already been added, for this instance). Returns false *only* if `-C instrument-coverage` is
|
||||
/// not enabled (a coverage map is not being generated).
|
||||
fn set_function_source_hash(
|
||||
&mut self,
|
||||
|
|
@ -30,7 +30,7 @@ pub trait CoverageInfoBuilderMethods<'tcx>: BackendTypes {
|
|||
function_source_hash: u64,
|
||||
) -> bool;
|
||||
|
||||
/// Returns true if the counter was added to the coverage map; false if `-Z instrument-coverage`
|
||||
/// Returns true if the counter was added to the coverage map; false if `-C instrument-coverage`
|
||||
/// is not enabled (a coverage map is not being generated).
|
||||
fn add_coverage_counter(
|
||||
&mut self,
|
||||
|
|
@ -40,7 +40,7 @@ pub trait CoverageInfoBuilderMethods<'tcx>: BackendTypes {
|
|||
) -> bool;
|
||||
|
||||
/// Returns true if the expression was added to the coverage map; false if
|
||||
/// `-Z instrument-coverage` is not enabled (a coverage map is not being generated).
|
||||
/// `-C instrument-coverage` is not enabled (a coverage map is not being generated).
|
||||
fn add_coverage_counter_expression(
|
||||
&mut self,
|
||||
instance: Instance<'tcx>,
|
||||
|
|
@ -51,7 +51,7 @@ pub trait CoverageInfoBuilderMethods<'tcx>: BackendTypes {
|
|||
region: Option<CodeRegion>,
|
||||
) -> bool;
|
||||
|
||||
/// Returns true if the region was added to the coverage map; false if `-Z instrument-coverage`
|
||||
/// Returns true if the region was added to the coverage map; false if `-C instrument-coverage`
|
||||
/// is not enabled (a coverage map is not being generated).
|
||||
fn add_coverage_unreachable(&mut self, instance: Instance<'tcx>, region: CodeRegion) -> bool;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,18 +133,18 @@ impl Hasher for StableHasher {
|
|||
|
||||
#[inline]
|
||||
fn write_isize(&mut self, i: isize) {
|
||||
// Always treat isize as i64 so we get the same results on 32 and 64 bit
|
||||
// Always treat isize as a 64-bit number so we get the same results on 32 and 64 bit
|
||||
// platforms. This is important for symbol hashes when cross compiling,
|
||||
// for example. Sign extending here is preferable as it means that the
|
||||
// same negative number hashes the same on both 32 and 64 bit platforms.
|
||||
let value = (i as i64).to_le() as u64;
|
||||
let value = i as u64;
|
||||
|
||||
// Cold path
|
||||
#[cold]
|
||||
#[inline(never)]
|
||||
fn hash_value(state: &mut SipHasher128, value: u64) {
|
||||
state.write_u8(0xFF);
|
||||
state.write_u64(value);
|
||||
state.write_u64(value.to_le());
|
||||
}
|
||||
|
||||
// `isize` values often seem to have a small (positive) numeric value in practice.
|
||||
|
|
@ -161,6 +161,10 @@ impl Hasher for StableHasher {
|
|||
// 8 bytes. Since this prefix cannot occur when we hash a single byte, when we hash two
|
||||
// `isize`s that fit within a different amount of bytes, they should always produce a different
|
||||
// byte stream for the hasher.
|
||||
//
|
||||
// To ensure that this optimization hashes the exact same bytes on both little-endian and
|
||||
// big-endian architectures, we compare the value with 0xFF before we convert the number
|
||||
// into a unified representation (little-endian).
|
||||
if value < 0xFF {
|
||||
self.state.write_u8(value as u8);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -159,4 +159,5 @@ fn test_isize_compression() {
|
|||
check_hash(0xAAAA, 0xAAAAAA);
|
||||
check_hash(0xAAAAAA, 0xAAAAAAAA);
|
||||
check_hash(0xFF, 0xFFFFFFFFFFFFFFFF);
|
||||
check_hash(u64::MAX /* -1 */, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -575,6 +575,7 @@ fn test_codegen_options_tracking_hash() {
|
|||
tracked!(force_frame_pointers, Some(false));
|
||||
tracked!(force_unwind_tables, Some(true));
|
||||
tracked!(inline_threshold, Some(0xf007ba11));
|
||||
tracked!(instrument_coverage, Some(InstrumentCoverage::All));
|
||||
tracked!(linker_plugin_lto, LinkerPluginLto::LinkerPluginAuto);
|
||||
tracked!(link_dead_code, Some(true));
|
||||
tracked!(llvm_args, vec![String::from("1"), String::from("2")]);
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ use rustc_data_structures::sync::MetadataRef;
|
|||
use rustc_errors::{struct_span_err, FatalError};
|
||||
use rustc_session::config::{self, CrateType};
|
||||
use rustc_session::cstore::{CrateSource, MetadataLoader};
|
||||
use rustc_session::filesearch::{FileDoesntMatch, FileMatches, FileSearch};
|
||||
use rustc_session::filesearch::FileSearch;
|
||||
use rustc_session::search_paths::PathKind;
|
||||
use rustc_session::utils::CanonicalizedPath;
|
||||
use rustc_session::Session;
|
||||
|
|
@ -371,15 +371,20 @@ impl<'a> CrateLocator<'a> {
|
|||
extra_prefix: &str,
|
||||
seen_paths: &mut FxHashSet<PathBuf>,
|
||||
) -> Result<Option<Library>, CrateError> {
|
||||
// want: crate_name.dir_part() + prefix + crate_name.file_part + "-"
|
||||
let dylib_prefix = format!("{}{}{}", self.target.dll_prefix, self.crate_name, extra_prefix);
|
||||
let rlib_prefix = format!("lib{}{}", self.crate_name, extra_prefix);
|
||||
let rmeta_prefix = &format!("lib{}{}", self.crate_name, extra_prefix);
|
||||
let rlib_prefix = rmeta_prefix;
|
||||
let dylib_prefix =
|
||||
&format!("{}{}{}", self.target.dll_prefix, self.crate_name, extra_prefix);
|
||||
let staticlib_prefix =
|
||||
format!("{}{}{}", self.target.staticlib_prefix, self.crate_name, extra_prefix);
|
||||
&format!("{}{}{}", self.target.staticlib_prefix, self.crate_name, extra_prefix);
|
||||
|
||||
let rmeta_suffix = ".rmeta";
|
||||
let rlib_suffix = ".rlib";
|
||||
let dylib_suffix = &self.target.dll_suffix;
|
||||
let staticlib_suffix = &self.target.staticlib_suffix;
|
||||
|
||||
let mut candidates: FxHashMap<_, (FxHashMap<_, _>, FxHashMap<_, _>, FxHashMap<_, _>)> =
|
||||
Default::default();
|
||||
let mut staticlibs = vec![];
|
||||
|
||||
// First, find all possible candidate rlibs and dylibs purely based on
|
||||
// the name of the files themselves. We're trying to match against an
|
||||
|
|
@ -394,46 +399,50 @@ impl<'a> CrateLocator<'a> {
|
|||
// of the crate id (path/name/id).
|
||||
//
|
||||
// The goal of this step is to look at as little metadata as possible.
|
||||
self.filesearch.search(|spf, kind| {
|
||||
let file = match &spf.file_name_str {
|
||||
None => return FileDoesntMatch,
|
||||
Some(file) => file,
|
||||
};
|
||||
let (hash, found_kind) = if file.starts_with(&rlib_prefix) && file.ends_with(".rlib") {
|
||||
(&file[(rlib_prefix.len())..(file.len() - ".rlib".len())], CrateFlavor::Rlib)
|
||||
} else if file.starts_with(&rlib_prefix) && file.ends_with(".rmeta") {
|
||||
(&file[(rlib_prefix.len())..(file.len() - ".rmeta".len())], CrateFlavor::Rmeta)
|
||||
} else if file.starts_with(&dylib_prefix) && file.ends_with(&self.target.dll_suffix) {
|
||||
(
|
||||
&file[(dylib_prefix.len())..(file.len() - self.target.dll_suffix.len())],
|
||||
CrateFlavor::Dylib,
|
||||
)
|
||||
} else {
|
||||
if file.starts_with(&staticlib_prefix)
|
||||
&& file.ends_with(&self.target.staticlib_suffix)
|
||||
{
|
||||
staticlibs
|
||||
.push(CrateMismatch { path: spf.path.clone(), got: "static".to_string() });
|
||||
}
|
||||
return FileDoesntMatch;
|
||||
};
|
||||
// Unfortunately, the prefix-based matching sometimes is over-eager.
|
||||
// E.g. if `rlib_suffix` is `libstd` it'll match the file
|
||||
// `libstd_detect-8d6701fb958915ad.rlib` (incorrect) as well as
|
||||
// `libstd-f3ab5b1dea981f17.rlib` (correct). But this is hard to avoid
|
||||
// given that `extra_filename` comes from the `-C extra-filename`
|
||||
// option and thus can be anything, and the incorrect match will be
|
||||
// handled safely in `extract_one`.
|
||||
for search_path in self.filesearch.search_paths() {
|
||||
debug!("searching {}", search_path.dir.display());
|
||||
for spf in search_path.files.iter() {
|
||||
debug!("testing {}", spf.path.display());
|
||||
|
||||
info!("lib candidate: {}", spf.path.display());
|
||||
let f = &spf.file_name_str;
|
||||
let (hash, kind) = if f.starts_with(rlib_prefix) && f.ends_with(rlib_suffix) {
|
||||
(&f[rlib_prefix.len()..(f.len() - rlib_suffix.len())], CrateFlavor::Rlib)
|
||||
} else if f.starts_with(rmeta_prefix) && f.ends_with(rmeta_suffix) {
|
||||
(&f[rmeta_prefix.len()..(f.len() - rmeta_suffix.len())], CrateFlavor::Rmeta)
|
||||
} else if f.starts_with(dylib_prefix) && f.ends_with(dylib_suffix) {
|
||||
(&f[dylib_prefix.len()..(f.len() - dylib_suffix.len())], CrateFlavor::Dylib)
|
||||
} else {
|
||||
if f.starts_with(staticlib_prefix) && f.ends_with(staticlib_suffix) {
|
||||
self.crate_rejections.via_kind.push(CrateMismatch {
|
||||
path: spf.path.clone(),
|
||||
got: "static".to_string(),
|
||||
});
|
||||
}
|
||||
continue;
|
||||
};
|
||||
|
||||
let (rlibs, rmetas, dylibs) = candidates.entry(hash.to_string()).or_default();
|
||||
let path = fs::canonicalize(&spf.path).unwrap_or_else(|_| spf.path.clone());
|
||||
if seen_paths.contains(&path) {
|
||||
return FileDoesntMatch;
|
||||
};
|
||||
seen_paths.insert(path.clone());
|
||||
match found_kind {
|
||||
CrateFlavor::Rlib => rlibs.insert(path, kind),
|
||||
CrateFlavor::Rmeta => rmetas.insert(path, kind),
|
||||
CrateFlavor::Dylib => dylibs.insert(path, kind),
|
||||
};
|
||||
FileMatches
|
||||
});
|
||||
self.crate_rejections.via_kind.extend(staticlibs);
|
||||
info!("lib candidate: {}", spf.path.display());
|
||||
|
||||
let (rlibs, rmetas, dylibs) = candidates.entry(hash.to_string()).or_default();
|
||||
let path = fs::canonicalize(&spf.path).unwrap_or_else(|_| spf.path.clone());
|
||||
if seen_paths.contains(&path) {
|
||||
continue;
|
||||
};
|
||||
seen_paths.insert(path.clone());
|
||||
match kind {
|
||||
CrateFlavor::Rlib => rlibs.insert(path, search_path.kind),
|
||||
CrateFlavor::Rmeta => rmetas.insert(path, search_path.kind),
|
||||
CrateFlavor::Dylib => dylibs.insert(path, search_path.kind),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// We have now collected all known libraries into a set of candidates
|
||||
// keyed of the filename hash listed. For each filename, we also have a
|
||||
|
|
|
|||
|
|
@ -1577,7 +1577,7 @@ pub enum StatementKind<'tcx> {
|
|||
/// - `Bivariant` -- no effect
|
||||
AscribeUserType(Box<(Place<'tcx>, UserTypeProjection)>, ty::Variance),
|
||||
|
||||
/// Marks the start of a "coverage region", injected with '-Zinstrument-coverage'. A
|
||||
/// Marks the start of a "coverage region", injected with '-Cinstrument-coverage'. A
|
||||
/// `Coverage` statement carries metadata about the coverage region, used to inject a coverage
|
||||
/// map into the binary. If `Coverage::kind` is a `Counter`, the statement also generates
|
||||
/// executable code, to increment a counter variable at runtime, each time the code region is
|
||||
|
|
|
|||
|
|
@ -390,7 +390,7 @@ pub struct DestructuredConst<'tcx> {
|
|||
}
|
||||
|
||||
/// Coverage information summarized from a MIR if instrumented for source code coverage (see
|
||||
/// compiler option `-Zinstrument-coverage`). This information is generated by the
|
||||
/// compiler option `-Cinstrument-coverage`). This information is generated by the
|
||||
/// `InstrumentCoverage` MIR pass and can be retrieved via the `coverageinfo` query.
|
||||
#[derive(Clone, TyEncodable, TyDecodable, Debug, HashStable)]
|
||||
pub struct CoverageInfo {
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ rustc_queries! {
|
|||
}
|
||||
|
||||
/// Returns coverage summary info for a function, after executing the `InstrumentCoverage`
|
||||
/// MIR pass (assuming the -Zinstrument-coverage option is enabled).
|
||||
/// MIR pass (assuming the -Cinstrument-coverage option is enabled).
|
||||
query coverageinfo(key: ty::InstanceDef<'tcx>) -> mir::CoverageInfo {
|
||||
desc { |tcx| "retrieving coverage info from MIR for `{}`", tcx.def_path_str(key.def_id()) }
|
||||
storage(ArenaCacheSelector<'tcx>)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
//!
|
||||
//! To enable coverage, include the rustc command line option:
|
||||
//!
|
||||
//! * `-Z instrument-coverage`
|
||||
//! * `-C instrument-coverage`
|
||||
//!
|
||||
//! MIR Dump Files, with additional `CoverageGraph` graphviz and `CoverageSpan` spanview
|
||||
//! ------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ pub fn remove_dead_blocks<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
|
|||
/// evaluation: `if false { ... }`.
|
||||
///
|
||||
/// Those statements are bypassed by redirecting paths in the CFG around the
|
||||
/// `dead blocks`; but with `-Z instrument-coverage`, the dead blocks usually
|
||||
/// `dead blocks`; but with `-C instrument-coverage`, the dead blocks usually
|
||||
/// include `Coverage` statements representing the Rust source code regions to
|
||||
/// be counted at runtime. Without these `Coverage` statements, the regions are
|
||||
/// lost, and the Rust source code will show no coverage information.
|
||||
|
|
|
|||
|
|
@ -127,16 +127,16 @@ pub enum MirSpanview {
|
|||
Block,
|
||||
}
|
||||
|
||||
/// The different settings that the `-Z instrument-coverage` flag can have.
|
||||
/// The different settings that the `-C instrument-coverage` flag can have.
|
||||
///
|
||||
/// Coverage instrumentation now supports combining `-Z instrument-coverage`
|
||||
/// Coverage instrumentation now supports combining `-C instrument-coverage`
|
||||
/// with compiler and linker optimization (enabled with `-O` or `-C opt-level=1`
|
||||
/// and higher). Nevertheless, there are many variables, depending on options
|
||||
/// selected, code structure, and enabled attributes. If errors are encountered,
|
||||
/// either while compiling or when generating `llvm-cov show` reports, consider
|
||||
/// lowering the optimization level, including or excluding `-C link-dead-code`,
|
||||
/// or using `-Z instrument-coverage=except-unused-functions` or `-Z
|
||||
/// instrument-coverage=except-unused-generics`.
|
||||
/// or using `-Zunstable-options -C instrument-coverage=except-unused-functions`
|
||||
/// or `-Zunstable-options -C instrument-coverage=except-unused-generics`.
|
||||
///
|
||||
/// Note that `ExceptUnusedFunctions` means: When `mapgen.rs` generates the
|
||||
/// coverage map, it will not attempt to generate synthetic functions for unused
|
||||
|
|
@ -148,13 +148,13 @@ pub enum MirSpanview {
|
|||
/// unless the function has type parameters.
|
||||
#[derive(Clone, Copy, PartialEq, Hash, Debug)]
|
||||
pub enum InstrumentCoverage {
|
||||
/// Default `-Z instrument-coverage` or `-Z instrument-coverage=statement`
|
||||
/// Default `-C instrument-coverage` or `-C instrument-coverage=statement`
|
||||
All,
|
||||
/// `-Z instrument-coverage=except-unused-generics`
|
||||
/// `-Zunstable-options -C instrument-coverage=except-unused-generics`
|
||||
ExceptUnusedGenerics,
|
||||
/// `-Z instrument-coverage=except-unused-functions`
|
||||
/// `-Zunstable-options -C instrument-coverage=except-unused-functions`
|
||||
ExceptUnusedFunctions,
|
||||
/// `-Z instrument-coverage=off` (or `no`, etc.)
|
||||
/// `-C instrument-coverage=off` (or `no`, etc.)
|
||||
Off,
|
||||
}
|
||||
|
||||
|
|
@ -2195,18 +2195,44 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
|
|||
_ => {}
|
||||
}
|
||||
|
||||
if debugging_opts.instrument_coverage.is_some()
|
||||
&& debugging_opts.instrument_coverage != Some(InstrumentCoverage::Off)
|
||||
{
|
||||
// Handle both `-Z instrument-coverage` and `-C instrument-coverage`; the latter takes
|
||||
// precedence.
|
||||
match (cg.instrument_coverage, debugging_opts.instrument_coverage) {
|
||||
(Some(ic_c), Some(ic_z)) if ic_c != ic_z => {
|
||||
early_error(
|
||||
error_format,
|
||||
"incompatible values passed for `-C instrument-coverage` \
|
||||
and `-Z instrument-coverage`",
|
||||
);
|
||||
}
|
||||
(Some(InstrumentCoverage::Off | InstrumentCoverage::All), _) => {}
|
||||
(Some(_), _) if !debugging_opts.unstable_options => {
|
||||
early_error(
|
||||
error_format,
|
||||
"`-C instrument-coverage=except-*` requires `-Z unstable-options`",
|
||||
);
|
||||
}
|
||||
(None, None) => {}
|
||||
(None, ic) => {
|
||||
early_warn(
|
||||
error_format,
|
||||
"`-Z instrument-coverage` is deprecated; use `-C instrument-coverage`",
|
||||
);
|
||||
cg.instrument_coverage = ic;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
if cg.instrument_coverage.is_some() && cg.instrument_coverage != Some(InstrumentCoverage::Off) {
|
||||
if cg.profile_generate.enabled() || cg.profile_use.is_some() {
|
||||
early_error(
|
||||
error_format,
|
||||
"option `-Z instrument-coverage` is not compatible with either `-C profile-use` \
|
||||
"option `-C instrument-coverage` is not compatible with either `-C profile-use` \
|
||||
or `-C profile-generate`",
|
||||
);
|
||||
}
|
||||
|
||||
// `-Z instrument-coverage` implies `-C symbol-mangling-version=v0` - to ensure consistent
|
||||
// `-C instrument-coverage` implies `-C symbol-mangling-version=v0` - to ensure consistent
|
||||
// and reversible name mangling. Note, LLVM coverage tools can analyze coverage over
|
||||
// multiple runs, including some changes to source code; so mangled names must be consistent
|
||||
// across compilations.
|
||||
|
|
@ -2215,7 +2241,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
|
|||
Some(SymbolManglingVersion::Legacy) => {
|
||||
early_warn(
|
||||
error_format,
|
||||
"-Z instrument-coverage requires symbol mangling version `v0`, \
|
||||
"-C instrument-coverage requires symbol mangling version `v0`, \
|
||||
but `-C symbol-mangling-version=legacy` was specified",
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
//! A module for searching for libraries
|
||||
|
||||
pub use self::FileMatch::*;
|
||||
|
||||
use std::env;
|
||||
use std::fs;
|
||||
use std::iter::FromIterator;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use crate::search_paths::{PathKind, SearchPath, SearchPathFile};
|
||||
use crate::search_paths::{PathKind, SearchPath};
|
||||
use rustc_fs_util::fix_windows_verbatim_for_gcc;
|
||||
use tracing::debug;
|
||||
|
||||
|
|
@ -43,36 +41,6 @@ impl<'a> FileSearch<'a> {
|
|||
self.get_lib_path().join("self-contained")
|
||||
}
|
||||
|
||||
pub fn search<F>(&self, mut pick: F)
|
||||
where
|
||||
F: FnMut(&SearchPathFile, PathKind) -> FileMatch,
|
||||
{
|
||||
for search_path in self.search_paths() {
|
||||
debug!("searching {}", search_path.dir.display());
|
||||
fn is_rlib(spf: &SearchPathFile) -> bool {
|
||||
if let Some(f) = &spf.file_name_str { f.ends_with(".rlib") } else { false }
|
||||
}
|
||||
// Reading metadata out of rlibs is faster, and if we find both
|
||||
// an rlib and a dylib we only read one of the files of
|
||||
// metadata, so in the name of speed, bring all rlib files to
|
||||
// the front of the search list.
|
||||
let files1 = search_path.files.iter().filter(|spf| is_rlib(&spf));
|
||||
let files2 = search_path.files.iter().filter(|spf| !is_rlib(&spf));
|
||||
for spf in files1.chain(files2) {
|
||||
debug!("testing {}", spf.path.display());
|
||||
let maybe_picked = pick(spf, search_path.kind);
|
||||
match maybe_picked {
|
||||
FileMatches => {
|
||||
debug!("picked {}", spf.path.display());
|
||||
}
|
||||
FileDoesntMatch => {
|
||||
debug!("rejected {}", spf.path.display());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(
|
||||
sysroot: &'a Path,
|
||||
triple: &'a str,
|
||||
|
|
|
|||
|
|
@ -109,17 +109,16 @@ impl Options {
|
|||
}
|
||||
|
||||
pub fn instrument_coverage(&self) -> bool {
|
||||
self.debugging_opts.instrument_coverage.unwrap_or(InstrumentCoverage::Off)
|
||||
!= InstrumentCoverage::Off
|
||||
self.cg.instrument_coverage.unwrap_or(InstrumentCoverage::Off) != InstrumentCoverage::Off
|
||||
}
|
||||
|
||||
pub fn instrument_coverage_except_unused_generics(&self) -> bool {
|
||||
self.debugging_opts.instrument_coverage.unwrap_or(InstrumentCoverage::Off)
|
||||
self.cg.instrument_coverage.unwrap_or(InstrumentCoverage::Off)
|
||||
== InstrumentCoverage::ExceptUnusedGenerics
|
||||
}
|
||||
|
||||
pub fn instrument_coverage_except_unused_functions(&self) -> bool {
|
||||
self.debugging_opts.instrument_coverage.unwrap_or(InstrumentCoverage::Off)
|
||||
self.cg.instrument_coverage.unwrap_or(InstrumentCoverage::Off)
|
||||
== InstrumentCoverage::ExceptUnusedFunctions
|
||||
}
|
||||
}
|
||||
|
|
@ -1031,6 +1030,14 @@ options! {
|
|||
"enable incremental compilation"),
|
||||
inline_threshold: Option<u32> = (None, parse_opt_number, [TRACKED],
|
||||
"set the threshold for inlining a function"),
|
||||
instrument_coverage: Option<InstrumentCoverage> = (None, parse_instrument_coverage, [TRACKED],
|
||||
"instrument the generated code to support LLVM source-based code coverage \
|
||||
reports (note, the compiler build config must include `profiler = true`); \
|
||||
implies `-C symbol-mangling-version=v0`. Optional values are:
|
||||
`=all` (implicit value)
|
||||
`=except-unused-generics`
|
||||
`=except-unused-functions`
|
||||
`=off` (default)"),
|
||||
link_arg: (/* redirected to link_args */) = ((), parse_string_push, [UNTRACKED],
|
||||
"a single extra argument to append to the linker invocation (can be used several times)"),
|
||||
link_args: Vec<String> = (Vec::new(), parse_list, [UNTRACKED],
|
||||
|
|
|
|||
|
|
@ -15,22 +15,15 @@ pub struct SearchPath {
|
|||
/// doable, but very slow, because it involves calls to `file_name` and
|
||||
/// `extension` that are themselves slow.
|
||||
///
|
||||
/// This type augments the `PathBuf` with an `Option<String>` containing the
|
||||
/// This type augments the `PathBuf` with an `String` containing the
|
||||
/// `PathBuf`'s filename. The prefix and suffix checking is much faster on the
|
||||
/// `Option<String>` than the `PathBuf`. (It's an `Option` because
|
||||
/// `Path::file_name` can fail; if that happens then all subsequent checking
|
||||
/// will also fail, which is fine.)
|
||||
/// `String` than the `PathBuf`. (The filename must be valid UTF-8. If it's
|
||||
/// not, the entry should be skipped, because all Rust output files are valid
|
||||
/// UTF-8, and so a non-UTF-8 filename couldn't be one we're looking for.)
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct SearchPathFile {
|
||||
pub path: PathBuf,
|
||||
pub file_name_str: Option<String>,
|
||||
}
|
||||
|
||||
impl SearchPathFile {
|
||||
fn new(path: PathBuf) -> SearchPathFile {
|
||||
let file_name_str = path.file_name().and_then(|f| f.to_str()).map(|s| s.to_string());
|
||||
SearchPathFile { path, file_name_str }
|
||||
}
|
||||
pub file_name_str: String,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Clone, Copy, Debug, Hash, Eq, Encodable, Decodable)]
|
||||
|
|
@ -85,7 +78,14 @@ impl SearchPath {
|
|||
// Get the files within the directory.
|
||||
let files = match std::fs::read_dir(&dir) {
|
||||
Ok(files) => files
|
||||
.filter_map(|e| e.ok().map(|e| SearchPathFile::new(e.path())))
|
||||
.filter_map(|e| {
|
||||
e.ok().and_then(|e| {
|
||||
e.file_name().to_str().map(|s| SearchPathFile {
|
||||
path: e.path(),
|
||||
file_name_str: s.to_string(),
|
||||
})
|
||||
})
|
||||
})
|
||||
.collect::<Vec<_>>(),
|
||||
Err(..) => vec![],
|
||||
};
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@ changelog-seen = 2
|
|||
#sanitizers = false
|
||||
|
||||
# Build the profiler runtime (required when compiling with options that depend
|
||||
# on this runtime, such as `-C profile-generate` or `-Z instrument-coverage`).
|
||||
# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
|
||||
#profiler = false
|
||||
|
||||
# Indicates whether the native libraries linked into Cargo will be statically
|
||||
|
|
@ -671,7 +671,7 @@ changelog-seen = 2
|
|||
#sanitizers = build.sanitizers (bool)
|
||||
|
||||
# Build the profiler runtime for this target(required when compiling with options that depend
|
||||
# on this runtime, such as `-C profile-generate` or `-Z instrument-coverage`).
|
||||
# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
|
||||
# This option will override the same option under [build] section.
|
||||
#profiler = build.profiler (bool)
|
||||
|
||||
|
|
|
|||
|
|
@ -1203,6 +1203,41 @@ impl<T: Clone> Rc<T> {
|
|||
// reference to the allocation.
|
||||
unsafe { &mut this.ptr.as_mut().value }
|
||||
}
|
||||
|
||||
/// If we have the only reference to `T` then unwrap it. Otherwise, clone `T` and return the
|
||||
/// clone.
|
||||
///
|
||||
/// Assuming `rc_t` is of type `Rc<T>`, this function is functionally equivalent to
|
||||
/// `(*rc_t).clone()`, but will avoid cloning the inner value where possible.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// #![feature(arc_unwrap_or_clone)]
|
||||
/// # use std::{ptr, rc::Rc};
|
||||
/// let inner = String::from("test");
|
||||
/// let ptr = inner.as_ptr();
|
||||
///
|
||||
/// let rc = Rc::new(inner);
|
||||
/// let inner = Rc::unwrap_or_clone(rc);
|
||||
/// // The inner value was not cloned
|
||||
/// assert!(ptr::eq(ptr, inner.as_ptr()));
|
||||
///
|
||||
/// let rc = Rc::new(inner);
|
||||
/// let rc2 = rc.clone();
|
||||
/// let inner = Rc::unwrap_or_clone(rc);
|
||||
/// // Because there were 2 references, we had to clone the inner value.
|
||||
/// assert!(!ptr::eq(ptr, inner.as_ptr()));
|
||||
/// // `rc2` is the last reference, so when we unwrap it we get back
|
||||
/// // the original `String`.
|
||||
/// let inner = Rc::unwrap_or_clone(rc2);
|
||||
/// assert!(ptr::eq(ptr, inner.as_ptr()));
|
||||
/// ```
|
||||
#[inline]
|
||||
#[unstable(feature = "arc_unwrap_or_clone", issue = "93610")]
|
||||
pub fn unwrap_or_clone(this: Self) -> T {
|
||||
Rc::try_unwrap(this).unwrap_or_else(|rc| (*rc).clone())
|
||||
}
|
||||
}
|
||||
|
||||
impl Rc<dyn Any> {
|
||||
|
|
|
|||
|
|
@ -1477,6 +1477,41 @@ impl<T: Clone> Arc<T> {
|
|||
// either unique to begin with, or became one upon cloning the contents.
|
||||
unsafe { Self::get_mut_unchecked(this) }
|
||||
}
|
||||
|
||||
/// If we have the only reference to `T` then unwrap it. Otherwise, clone `T` and return the
|
||||
/// clone.
|
||||
///
|
||||
/// Assuming `arc_t` is of type `Arc<T>`, this function is functionally equivalent to
|
||||
/// `(*arc_t).clone()`, but will avoid cloning the inner value where possible.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// #![feature(arc_unwrap_or_clone)]
|
||||
/// # use std::{ptr, sync::Arc};
|
||||
/// let inner = String::from("test");
|
||||
/// let ptr = inner.as_ptr();
|
||||
///
|
||||
/// let arc = Arc::new(inner);
|
||||
/// let inner = Arc::unwrap_or_clone(arc);
|
||||
/// // The inner value was not cloned
|
||||
/// assert!(ptr::eq(ptr, inner.as_ptr()));
|
||||
///
|
||||
/// let arc = Arc::new(inner);
|
||||
/// let arc2 = arc.clone();
|
||||
/// let inner = Arc::unwrap_or_clone(arc);
|
||||
/// // Because there were 2 references, we had to clone the inner value.
|
||||
/// assert!(!ptr::eq(ptr, inner.as_ptr()));
|
||||
/// // `arc2` is the last reference, so when we unwrap it we get back
|
||||
/// // the original `String`.
|
||||
/// let inner = Arc::unwrap_or_clone(arc2);
|
||||
/// assert!(ptr::eq(ptr, inner.as_ptr()));
|
||||
/// ```
|
||||
#[inline]
|
||||
#[unstable(feature = "arc_unwrap_or_clone", issue = "93610")]
|
||||
pub fn unwrap_or_clone(this: Self) -> T {
|
||||
Arc::try_unwrap(this).unwrap_or_else(|arc| (*arc).clone())
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: ?Sized> Arc<T> {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ macro_rules! int_impl {
|
|||
$reversed:expr, $le_bytes:expr, $be_bytes:expr,
|
||||
$to_xe_bytes_doc:expr, $from_xe_bytes_doc:expr) => {
|
||||
/// The smallest value that can be represented by this integer type,
|
||||
#[doc = concat!("-2<sup>", $BITS_MINUS_ONE, "</sup>.")]
|
||||
#[doc = concat!("−2<sup>", $BITS_MINUS_ONE, "</sup>.")]
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
|
|
@ -17,7 +17,7 @@ macro_rules! int_impl {
|
|||
pub const MIN: Self = !0 ^ ((!0 as $UnsignedT) >> 1) as Self;
|
||||
|
||||
/// The largest value that can be represented by this integer type,
|
||||
#[doc = concat!("2<sup>", $BITS_MINUS_ONE, "</sup> - 1.")]
|
||||
#[doc = concat!("2<sup>", $BITS_MINUS_ONE, "</sup> − 1.")]
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ macro_rules! uint_impl {
|
|||
pub const MIN: Self = 0;
|
||||
|
||||
/// The largest value that can be represented by this integer type,
|
||||
#[doc = concat!("2<sup>", $BITS, "</sup> - 1.")]
|
||||
#[doc = concat!("2<sup>", $BITS, "</sup> − 1.")]
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ impl SystemTime {
|
|||
tm_min: rtc.tm_min,
|
||||
tm_hour: rtc.tm_hour,
|
||||
tm_mday: rtc.tm_mday,
|
||||
tm_mon: rtc.tm_mon,
|
||||
tm_mon: rtc.tm_mon - 1,
|
||||
tm_year: rtc.tm_year,
|
||||
tm_wday: rtc.tm_wday,
|
||||
tm_yday: 0,
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
- [Custom Targets](targets/custom.md)
|
||||
- [Known Issues](targets/known-issues.md)
|
||||
- [Profile-guided Optimization](profile-guided-optimization.md)
|
||||
- [Instrumentation-based Code Coverage](instrument-coverage.md)
|
||||
- [Linker-plugin based LTO](linker-plugin-lto.md)
|
||||
- [Exploit Mitigations](exploit-mitigations.md)
|
||||
- [Contributing to `rustc`](contributing.md)
|
||||
|
|
|
|||
|
|
@ -177,6 +177,15 @@ The default depends on the [opt-level](#opt-level):
|
|||
| s | 75 |
|
||||
| z | 25 |
|
||||
|
||||
## instrument-coverage
|
||||
|
||||
This option enables instrumentation-based code coverage support. See the
|
||||
chapter on [instrumentation-based code coverage] for more information.
|
||||
|
||||
Note that while the `-C instrument-coverage` option is stable, the profile data
|
||||
format produced by the resulting instrumentation may change, and may not work
|
||||
with coverage tools other than those built and shipped with the compiler.
|
||||
|
||||
## link-arg
|
||||
|
||||
This flag lets you append a single extra argument to the linker invocation.
|
||||
|
|
@ -597,5 +606,6 @@ effective only for x86 targets.
|
|||
|
||||
[option-emit]: ../command-line-arguments.md#option-emit
|
||||
[option-o-optimize]: ../command-line-arguments.md#option-o-optimize
|
||||
[instrumentation-based code coverage]: ../instrument-coverage.md
|
||||
[profile-guided optimization]: ../profile-guided-optimization.md
|
||||
[option-g-debug]: ../command-line-arguments.md#option-g-debug
|
||||
|
|
|
|||
|
|
@ -1,23 +1,17 @@
|
|||
# `instrument-coverage`
|
||||
|
||||
The tracking issue for this feature is: [#79121].
|
||||
|
||||
[#79121]: https://github.com/rust-lang/rust/issues/79121
|
||||
|
||||
---
|
||||
|
||||
## Introduction
|
||||
|
||||
The Rust compiler includes two code coverage implementations:
|
||||
|
||||
- A GCC-compatible, gcov-based coverage implementation, enabled with `-Z profile`, which derives coverage data based on DebugInfo.
|
||||
- A source-based code coverage implementation, enabled with `-Z instrument-coverage`, which uses LLVM's native, efficient coverage instrumentation to generate very precise coverage data.
|
||||
- A source-based code coverage implementation, enabled with `-C instrument-coverage`, which uses LLVM's native, efficient coverage instrumentation to generate very precise coverage data.
|
||||
|
||||
This document describes how to enable and use the LLVM instrumentation-based coverage, via the `-Z instrument-coverage` compiler flag.
|
||||
This document describes how to enable and use the LLVM instrumentation-based coverage, via the `-C instrument-coverage` compiler flag.
|
||||
|
||||
## How it works
|
||||
|
||||
When `-Z instrument-coverage` is enabled, the Rust compiler enhances rust-based libraries and binaries by:
|
||||
When `-C instrument-coverage` is enabled, the Rust compiler enhances rust-based libraries and binaries by:
|
||||
|
||||
- Automatically injecting calls to an LLVM intrinsic ([`llvm.instrprof.increment`]), at functions and branches in compiled code, to increment counters when conditional sections of code are executed.
|
||||
- Embedding additional information in the data section of each library and binary (using the [LLVM Code Coverage Mapping Format] _Version 5_, if compiling with LLVM 12, or _Version 6_, if compiling with LLVM 13 or higher), to define the code regions (start and end positions in the source code) being counted.
|
||||
|
|
@ -27,13 +21,13 @@ When running a coverage-instrumented program, the counter values are written to
|
|||
[`llvm.instrprof.increment`]: https://llvm.org/docs/LangRef.html#llvm-instrprof-increment-intrinsic
|
||||
[llvm code coverage mapping format]: https://llvm.org/docs/CoverageMappingFormat.html
|
||||
|
||||
> **Note**: `-Z instrument-coverage` also automatically enables `-C symbol-mangling-version=v0` (tracking issue [#60705]). The `v0` symbol mangler is strongly recommended, but be aware that this demangler is also experimental. The `v0` demangler can be overridden by explicitly adding `-Z unstable-options -C symbol-mangling-version=legacy`.
|
||||
> **Note**: `-C instrument-coverage` also automatically enables `-C symbol-mangling-version=v0` (tracking issue [#60705]). The `v0` symbol mangler is strongly recommended. The `v0` demangler can be overridden by explicitly adding `-Z unstable-options -C symbol-mangling-version=legacy`.
|
||||
|
||||
[#60705]: https://github.com/rust-lang/rust/issues/60705
|
||||
|
||||
## Enable coverage profiling in the Rust compiler
|
||||
|
||||
Rust's source-based code coverage requires the Rust "profiler runtime". Without it, compiling with `-Z instrument-coverage` generates an error that the profiler runtime is missing.
|
||||
Rust's source-based code coverage requires the Rust "profiler runtime". Without it, compiling with `-C instrument-coverage` generates an error that the profiler runtime is missing.
|
||||
|
||||
The Rust `nightly` distribution channel includes the profiler runtime, by default.
|
||||
|
||||
|
|
@ -41,7 +35,7 @@ The Rust `nightly` distribution channel includes the profiler runtime, by defaul
|
|||
>
|
||||
> ```toml
|
||||
> # Build the profiler runtime (required when compiling with options that depend
|
||||
> # on this runtime, such as `-C profile-generate` or `-Z instrument-coverage`).
|
||||
> # on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
|
||||
> profiler = true
|
||||
> ```
|
||||
|
||||
|
|
@ -65,9 +59,9 @@ $ ./x.py build rust-demangler
|
|||
|
||||
## Compiling with coverage enabled
|
||||
|
||||
Set the `-Z instrument-coverage` compiler flag in order to enable LLVM source-based code coverage profiling.
|
||||
Set the `-C instrument-coverage` compiler flag in order to enable LLVM source-based code coverage profiling.
|
||||
|
||||
The default option generates coverage for all functions, including unused (never called) functions and generics. The compiler flag supports an optional value to tailor this behavior. (See [`-Z instrument-coverage=<options>`](#-z-instrument-coverageoptions), below.)
|
||||
The default option generates coverage for all functions, including unused (never called) functions and generics. The compiler flag supports an optional value to tailor this behavior. (See [`-C instrument-coverage=<options>`](#-c-instrument-coverageoptions), below.)
|
||||
|
||||
With `cargo`, you can instrument your program binary _and_ dependencies at the same time.
|
||||
|
||||
|
|
@ -76,18 +70,18 @@ For example (if your project's Cargo.toml builds a binary by default):
|
|||
```shell
|
||||
$ cd your-project
|
||||
$ cargo clean
|
||||
$ RUSTFLAGS="-Z instrument-coverage" cargo build
|
||||
$ RUSTFLAGS="-C instrument-coverage" cargo build
|
||||
```
|
||||
|
||||
If `cargo` is not configured to use your `profiler`-enabled version of `rustc`, set the path explicitly via the `RUSTC` environment variable. Here is another example, using a `stage1` build of `rustc` to compile an `example` binary (from the [`json5format`] crate):
|
||||
|
||||
```shell
|
||||
$ RUSTC=$HOME/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc \
|
||||
RUSTFLAGS="-Z instrument-coverage" \
|
||||
RUSTFLAGS="-C instrument-coverage" \
|
||||
cargo build --example formatjson5
|
||||
```
|
||||
|
||||
> **Note**: that some compiler options, combined with `-Z instrument-coverage`, can produce LLVM IR and/or linked binaries that are incompatible with LLVM coverage maps. For example, coverage requires references to actual functions in LLVM IR. If any covered function is optimized out, the coverage tools may not be able to process the coverage results. If you need to pass additional options, with coverage enabled, test them early, to confirm you will get the coverage results you expect.
|
||||
> **Note**: that some compiler options, combined with `-C instrument-coverage`, can produce LLVM IR and/or linked binaries that are incompatible with LLVM coverage maps. For example, coverage requires references to actual functions in LLVM IR. If any covered function is optimized out, the coverage tools may not be able to process the coverage results. If you need to pass additional options, with coverage enabled, test them early, to confirm you will get the coverage results you expect.
|
||||
|
||||
## Running the instrumented binary to generate raw coverage profiling data
|
||||
|
||||
|
|
@ -123,31 +117,23 @@ If `LLVM_PROFILE_FILE` contains a path to a non-existent directory, the missing
|
|||
|
||||
## Installing LLVM coverage tools
|
||||
|
||||
LLVM's supplies two tools—`llvm-profdata` and `llvm-cov`—that process coverage data and generate reports. There are several ways to find and/or install these tools, but note that the coverage mapping data generated by the Rust compiler requires LLVM version 12 or higher. (`llvm-cov --version` typically shows the tool's LLVM version number.):
|
||||
LLVM's supplies two tools—`llvm-profdata` and `llvm-cov`—that process coverage data and generate reports. There are several ways to find and/or install these tools, but note that the coverage mapping data generated by the Rust compiler requires LLVM version 12 or higher, and processing the *raw* data may require exactly the LLVM version used by the compiler. (`llvm-cov --version` typically shows the tool's LLVM version number, and `rustc --verbose --version` shows the version of LLVM used by the Rust compiler.)
|
||||
|
||||
- The LLVM tools may be installed (or installable) directly to your OS (such as via `apt-get`, for Linux).
|
||||
- You can install compatible versions of these tools via the `rustup` component `llvm-tools-preview`. This component is the recommended path, though the specific tools available and their interface is not currently subject to Rust's usual stability guarantees. In this case, you may also find `cargo-binutils` useful as a wrapper around these tools.
|
||||
- You can install a compatible version of LLVM tools from your operating system distribution, or from your distribution of LLVM.
|
||||
- If you are building the Rust compiler from source, you can optionally use the bundled LLVM tools, built from source. Those tool binaries can typically be found in your build platform directory at something like: `rust/build/x86_64-unknown-linux-gnu/llvm/bin/llvm-*`.
|
||||
- You can install compatible versions of these tools via `rustup`.
|
||||
|
||||
The `rustup` option is guaranteed to install a compatible version of the LLVM tools, but they can be hard to find. We recommend [`cargo-binutils`], which installs Rust-specific wrappers around these and other LLVM tools, so you can invoke them via `cargo` commands!
|
||||
|
||||
```shell
|
||||
$ rustup component add llvm-tools-preview
|
||||
$ cargo install cargo-binutils
|
||||
$ cargo profdata -- --help # note the additional "--" preceding the tool-specific arguments
|
||||
```
|
||||
|
||||
[`cargo-binutils`]: https://crates.io/crates/cargo-binutils
|
||||
The examples in this document show how to use the llvm tools directly.
|
||||
|
||||
## Creating coverage reports
|
||||
|
||||
Raw profiles have to be indexed before they can be used to generate coverage reports. This is done using [`llvm-profdata merge`] (or `cargo profdata -- merge`), which can combine multiple raw profiles and index them at the same time:
|
||||
Raw profiles have to be indexed before they can be used to generate coverage reports. This is done using [`llvm-profdata merge`], which can combine multiple raw profiles and index them at the same time:
|
||||
|
||||
```shell
|
||||
$ llvm-profdata merge -sparse formatjson5.profraw -o formatjson5.profdata
|
||||
```
|
||||
|
||||
Finally, the `.profdata` file is used, in combination with the coverage map (from the program binary) to generate coverage reports using [`llvm-cov report`] (or `cargo cov -- report`), for a coverage summaries; and [`llvm-cov show`] (or `cargo cov -- show`), to see detailed coverage of lines and regions (character ranges) overlaid on the original source code.
|
||||
Finally, the `.profdata` file is used, in combination with the coverage map (from the program binary) to generate coverage reports using [`llvm-cov report`], for a coverage summaries; and [`llvm-cov show`], to see detailed coverage of lines and regions (character ranges) overlaid on the original source code.
|
||||
|
||||
These commands have several display and filtering options. For example:
|
||||
|
||||
|
|
@ -176,7 +162,7 @@ Some of the more notable options in this example include:
|
|||
|
||||
> **Note**: Coverage can also be disabled on an individual function by annotating the function with the [`no_coverage` attribute] (which requires the feature flag `#![feature(no_coverage)]`).
|
||||
|
||||
[`no_coverage` attribute]: ../language-features/no-coverage.md
|
||||
[`no_coverage` attribute]: ../unstable-book/language-features/no-coverage.html
|
||||
|
||||
## Interpreting reports
|
||||
|
||||
|
|
@ -195,10 +181,10 @@ A typical use case for coverage analysis is test coverage. Rust's source-based c
|
|||
|
||||
The following example (using the [`json5format`] crate, for demonstration purposes) show how to generate and analyze coverage results for all tests in a crate.
|
||||
|
||||
Since `cargo test` both builds and runs the tests, we set both the additional `RUSTFLAGS`, to add the `-Z instrument-coverage` flag, and `LLVM_PROFILE_FILE`, to set a custom filename for the raw profiling data generated during the test runs. Since there may be more than one test binary, apply `%m` in the filename pattern. This generates unique names for each test binary. (Otherwise, each executed test binary would overwrite the coverage results from the previous binary.)
|
||||
Since `cargo test` both builds and runs the tests, we set both the additional `RUSTFLAGS`, to add the `-C instrument-coverage` flag, and `LLVM_PROFILE_FILE`, to set a custom filename for the raw profiling data generated during the test runs. Since there may be more than one test binary, apply `%m` in the filename pattern. This generates unique names for each test binary. (Otherwise, each executed test binary would overwrite the coverage results from the previous binary.)
|
||||
|
||||
```shell
|
||||
$ RUSTFLAGS="-Z instrument-coverage" \
|
||||
$ RUSTFLAGS="-C instrument-coverage" \
|
||||
LLVM_PROFILE_FILE="json5format-%m.profraw" \
|
||||
cargo test --tests
|
||||
```
|
||||
|
|
@ -224,19 +210,18 @@ test result: ok. 31 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
|
|||
You should have one or more `.profraw` files now, one for each test binary. Run the `profdata` tool to merge them:
|
||||
|
||||
```shell
|
||||
$ cargo profdata -- merge \
|
||||
-sparse json5format-*.profraw -o json5format.profdata
|
||||
$ llvm-profdata merge -sparse json5format-*.profraw -o json5format.profdata
|
||||
```
|
||||
|
||||
Then run the `cov` tool, with the `profdata` file and all test binaries:
|
||||
|
||||
```shell
|
||||
$ cargo cov -- report \
|
||||
$ llvm-cov report \
|
||||
--use-color --ignore-filename-regex='/.cargo/registry' \
|
||||
--instr-profile=json5format.profdata \
|
||||
--object target/debug/deps/lib-30768f9c53506dc5 \
|
||||
--object target/debug/deps/json5format-fececd4653271682
|
||||
$ cargo cov -- show \
|
||||
$ llvm-cov show \
|
||||
--use-color --ignore-filename-regex='/.cargo/registry' \
|
||||
--instr-profile=json5format.profdata \
|
||||
--object target/debug/deps/lib-30768f9c53506dc5 \
|
||||
|
|
@ -252,11 +237,11 @@ $ cargo cov -- show \
|
|||
For `bash` users, one suggested way to automatically complete the `cov` command with the list of binaries is with a command like:
|
||||
|
||||
```bash
|
||||
$ cargo cov -- report \
|
||||
$ llvm-cov report \
|
||||
$( \
|
||||
for file in \
|
||||
$( \
|
||||
RUSTFLAGS="-Z instrument-coverage" \
|
||||
RUSTFLAGS="-C instrument-coverage" \
|
||||
cargo test --tests --no-run --message-format=json \
|
||||
| jq -r "select(.profile.test == true) | .filenames[]" \
|
||||
| grep -v dSYM - \
|
||||
|
|
@ -280,28 +265,27 @@ for each listed test binary.
|
|||
The previous examples run `cargo test` with `--tests`, which excludes doc tests.[^79417]
|
||||
|
||||
To include doc tests in the coverage results, drop the `--tests` flag, and apply the
|
||||
`-Z instrument-coverage` flag, and some doc-test-specific options in the
|
||||
`RUSTDOCFLAGS` environment variable. (The `cargo profdata` command does not change.)
|
||||
`-C instrument-coverage` flag, and some doc-test-specific options in the
|
||||
`RUSTDOCFLAGS` environment variable. (The `llvm-profdata` command does not change.)
|
||||
|
||||
```bash
|
||||
$ RUSTFLAGS="-Z instrument-coverage" \
|
||||
RUSTDOCFLAGS="-Z instrument-coverage -Z unstable-options --persist-doctests target/debug/doctestbins" \
|
||||
$ RUSTFLAGS="-C instrument-coverage" \
|
||||
RUSTDOCFLAGS="-C instrument-coverage -Z unstable-options --persist-doctests target/debug/doctestbins" \
|
||||
LLVM_PROFILE_FILE="json5format-%m.profraw" \
|
||||
cargo test
|
||||
$ cargo profdata -- merge \
|
||||
-sparse json5format-*.profraw -o json5format.profdata
|
||||
$ llvm-profdata merge -sparse json5format-*.profraw -o json5format.profdata
|
||||
```
|
||||
|
||||
The `-Z unstable-options --persist-doctests` flag is required, to save the test binaries
|
||||
(with their coverage maps) for `llvm-cov`.
|
||||
|
||||
```bash
|
||||
$ cargo cov -- report \
|
||||
$ llvm-cov report \
|
||||
$( \
|
||||
for file in \
|
||||
$( \
|
||||
RUSTFLAGS="-Z instrument-coverage" \
|
||||
RUSTDOCFLAGS="-Z instrument-coverage -Z unstable-options --persist-doctests target/debug/doctestbins" \
|
||||
RUSTFLAGS="-C instrument-coverage" \
|
||||
RUSTDOCFLAGS="-C instrument-coverage -Z unstable-options --persist-doctests target/debug/doctestbins" \
|
||||
cargo test --no-run --message-format=json \
|
||||
| jq -r "select(.profile.test == true) | .filenames[]" \
|
||||
| grep -v dSYM - \
|
||||
|
|
@ -314,8 +298,8 @@ $ cargo cov -- report \
|
|||
--instr-profile=json5format.profdata --summary-only # and/or other options
|
||||
```
|
||||
|
||||
> **Note**: The differences in this `cargo cov` command, compared with the version without
|
||||
> doc tests, include:
|
||||
> **Note**: The differences in this `llvm-cov` invocation, compared with the
|
||||
> version without doc tests, include:
|
||||
|
||||
- The `cargo test ... --no-run` command is updated with the same environment variables
|
||||
and flags used to _build_ the tests, _including_ the doc tests. (`LLVM_PROFILE_FILE`
|
||||
|
|
@ -331,12 +315,12 @@ $ cargo cov -- report \
|
|||
[(#79417)](https://github.com/rust-lang/rust/issues/79417) that doc test coverage
|
||||
generates incorrect source line numbers in `llvm-cov show` results.
|
||||
|
||||
## `-Z instrument-coverage=<options>`
|
||||
## `-C instrument-coverage=<options>`
|
||||
|
||||
- `-Z instrument-coverage=all`: Instrument all functions, including unused functions and unused generics. (This is the same as `-Z instrument-coverage`, with no value.)
|
||||
- `-Z instrument-coverage=except-unused-generics`: Instrument all functions except unused generics.
|
||||
- `-Z instrument-coverage=except-unused-functions`: Instrument only used (called) functions and instantiated generic functions.
|
||||
- `-Z instrument-coverage=off`: Do not instrument any functions. (This is the same as simply not including the `-Z instrument-coverage` option.)
|
||||
- `-C instrument-coverage=all`: Instrument all functions, including unused functions and unused generics. (This is the same as `-C instrument-coverage`, with no value.)
|
||||
- `-C instrument-coverage=off`: Do not instrument any functions. (This is the same as simply not including the `-C instrument-coverage` option.)
|
||||
- `-Zunstable-options -C instrument-coverage=except-unused-generics`: Instrument all functions except unused generics.
|
||||
- `-Zunstable-options -C instrument-coverage=except-unused-functions`: Instrument only used (called) functions and instantiated generic functions.
|
||||
|
||||
## Other references
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# `source-based-code-coverage`
|
||||
|
||||
See compiler flag [`-Z instrument-coverage`].
|
||||
|
||||
[`-z instrument-coverage`]: ./instrument-coverage.html
|
||||
|
|
@ -659,7 +659,7 @@ crate fn make_test(
|
|||
} else {
|
||||
let returns_result = everything_else.trim_end().ends_with("(())");
|
||||
// Give each doctest main function a unique name.
|
||||
// This is for example needed for the tooling around `-Z instrument-coverage`.
|
||||
// This is for example needed for the tooling around `-C instrument-coverage`.
|
||||
let inner_fn_name = if let Some(test_id) = test_id {
|
||||
format!("_doctest_main_{}", test_id)
|
||||
} else {
|
||||
|
|
@ -684,7 +684,7 @@ crate fn make_test(
|
|||
};
|
||||
// Note on newlines: We insert a line/newline *before*, and *after*
|
||||
// the doctest and adjust the `line_offset` accordingly.
|
||||
// In the case of `-Z instrument-coverage`, this means that the generated
|
||||
// In the case of `-C instrument-coverage`, this means that the generated
|
||||
// inner `main` function spans from the doctest opening codeblock to the
|
||||
// closing one. For example
|
||||
// /// ``` <- start of the inner main
|
||||
|
|
|
|||
|
|
@ -1265,7 +1265,7 @@ fn notable_traits_decl(decl: &clean::FnDecl, cx: &Context<'_>) -> String {
|
|||
if out.is_empty() {
|
||||
write!(
|
||||
&mut out,
|
||||
"<div class=\"notable\">Notable traits for {}</div>\
|
||||
"<span class=\"notable\">Notable traits for {}</span>\
|
||||
<code class=\"content\">",
|
||||
impl_.for_.print(cx)
|
||||
);
|
||||
|
|
@ -1297,9 +1297,9 @@ fn notable_traits_decl(decl: &clean::FnDecl, cx: &Context<'_>) -> String {
|
|||
out.insert_str(
|
||||
0,
|
||||
"<span class=\"notable-traits\"><span class=\"notable-traits-tooltip\">ⓘ\
|
||||
<div class=\"notable-traits-tooltiptext\"><span class=\"docblock\">",
|
||||
<span class=\"notable-traits-tooltiptext\"><span class=\"docblock\">",
|
||||
);
|
||||
out.push_str("</code></span></div></span></span>");
|
||||
out.push_str("</code></span></span></span></span>");
|
||||
}
|
||||
|
||||
out.into_inner()
|
||||
|
|
@ -1431,7 +1431,7 @@ fn render_impl(
|
|||
.map(|item| format!("{}.{}", item.type_(), name));
|
||||
write!(
|
||||
w,
|
||||
"<div id=\"{}\" class=\"{}{} has-srclink\">",
|
||||
"<section id=\"{}\" class=\"{}{} has-srclink\">",
|
||||
id, item_type, in_trait_class,
|
||||
);
|
||||
render_rightside(w, cx, item, containing_item, render_mode);
|
||||
|
|
@ -1446,7 +1446,7 @@ fn render_impl(
|
|||
render_mode,
|
||||
);
|
||||
w.write_str("</h4>");
|
||||
w.write_str("</div>");
|
||||
w.write_str("</section>");
|
||||
}
|
||||
}
|
||||
clean::TypedefItem(ref tydef, _) => {
|
||||
|
|
@ -1454,7 +1454,7 @@ fn render_impl(
|
|||
let id = cx.derive_id(source_id.clone());
|
||||
write!(
|
||||
w,
|
||||
"<div id=\"{}\" class=\"{}{} has-srclink\">",
|
||||
"<section id=\"{}\" class=\"{}{} has-srclink\">",
|
||||
id, item_type, in_trait_class
|
||||
);
|
||||
write!(w, "<a href=\"#{}\" class=\"anchor\"></a>", id);
|
||||
|
|
@ -1469,14 +1469,14 @@ fn render_impl(
|
|||
cx,
|
||||
);
|
||||
w.write_str("</h4>");
|
||||
w.write_str("</div>");
|
||||
w.write_str("</section>");
|
||||
}
|
||||
clean::AssocConstItem(ref ty, _) => {
|
||||
let source_id = format!("{}.{}", item_type, name);
|
||||
let id = cx.derive_id(source_id.clone());
|
||||
write!(
|
||||
w,
|
||||
"<div id=\"{}\" class=\"{}{} has-srclink\">",
|
||||
"<section id=\"{}\" class=\"{}{} has-srclink\">",
|
||||
id, item_type, in_trait_class
|
||||
);
|
||||
render_rightside(w, cx, item, containing_item, render_mode);
|
||||
|
|
@ -1491,12 +1491,12 @@ fn render_impl(
|
|||
cx,
|
||||
);
|
||||
w.write_str("</h4>");
|
||||
w.write_str("</div>");
|
||||
w.write_str("</section>");
|
||||
}
|
||||
clean::AssocTypeItem(ref bounds, ref default) => {
|
||||
let source_id = format!("{}.{}", item_type, name);
|
||||
let id = cx.derive_id(source_id.clone());
|
||||
write!(w, "<div id=\"{}\" class=\"{}{}\">", id, item_type, in_trait_class,);
|
||||
write!(w, "<section id=\"{}\" class=\"{}{}\">", id, item_type, in_trait_class,);
|
||||
write!(w, "<a href=\"#{}\" class=\"anchor\"></a>", id);
|
||||
w.write_str("<h4 class=\"code-header\">");
|
||||
assoc_type(
|
||||
|
|
@ -1509,7 +1509,7 @@ fn render_impl(
|
|||
cx,
|
||||
);
|
||||
w.write_str("</h4>");
|
||||
w.write_str("</div>");
|
||||
w.write_str("</section>");
|
||||
}
|
||||
clean::StrippedItem(..) => return,
|
||||
_ => panic!("can't make docs for trait item with name {:?}", item.name),
|
||||
|
|
@ -1668,21 +1668,23 @@ fn render_rightside(
|
|||
RenderMode::ForDeref { .. } => (None, None),
|
||||
};
|
||||
|
||||
write!(w, "<div class=\"rightside\">");
|
||||
let mut rightside = Buffer::new();
|
||||
let has_stability = render_stability_since_raw(
|
||||
w,
|
||||
&mut rightside,
|
||||
item.stable_since(tcx),
|
||||
const_stability,
|
||||
containing_item.stable_since(tcx),
|
||||
const_stable_since,
|
||||
);
|
||||
let mut tmp_buf = Buffer::empty_from(w);
|
||||
write_srclink(cx, item, &mut tmp_buf);
|
||||
if has_stability && !tmp_buf.is_empty() {
|
||||
w.write_str(" · ");
|
||||
let mut srclink = Buffer::empty_from(w);
|
||||
write_srclink(cx, item, &mut srclink);
|
||||
if has_stability && !srclink.is_empty() {
|
||||
rightside.write_str(" · ");
|
||||
}
|
||||
rightside.push_buffer(srclink);
|
||||
if !rightside.is_empty() {
|
||||
write!(w, "<span class=\"rightside\">{}</span>", rightside.into_inner());
|
||||
}
|
||||
w.push_buffer(tmp_buf);
|
||||
w.write_str("</div>");
|
||||
}
|
||||
|
||||
pub(crate) fn render_impl_summary(
|
||||
|
|
@ -1713,7 +1715,7 @@ pub(crate) fn render_impl_summary(
|
|||
} else {
|
||||
format!(" data-aliases=\"{}\"", aliases.join(","))
|
||||
};
|
||||
write!(w, "<div id=\"{}\" class=\"impl has-srclink\"{}>", id, aliases);
|
||||
write!(w, "<section id=\"{}\" class=\"impl has-srclink\"{}>", id, aliases);
|
||||
render_rightside(w, cx, &i.impl_item, containing_item, RenderMode::Normal);
|
||||
write!(w, "<a href=\"#{}\" class=\"anchor\"></a>", id);
|
||||
write!(w, "<h3 class=\"code-header in-band\">");
|
||||
|
|
@ -1737,11 +1739,11 @@ pub(crate) fn render_impl_summary(
|
|||
let is_trait = i.inner_impl().trait_.is_some();
|
||||
if is_trait {
|
||||
if let Some(portability) = portability(&i.impl_item, Some(parent)) {
|
||||
write!(w, "<div class=\"item-info\">{}</div>", portability);
|
||||
write!(w, "<span class=\"item-info\">{}</span>", portability);
|
||||
}
|
||||
}
|
||||
|
||||
w.write_str("</div>");
|
||||
w.write_str("</section>");
|
||||
}
|
||||
|
||||
fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Buffer) {
|
||||
|
|
@ -1802,19 +1804,9 @@ fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Buffer) {
|
|||
// to navigate the documentation (though slightly inefficiently).
|
||||
|
||||
if !it.is_mod() {
|
||||
buffer.write_str("<h2 class=\"location\">In ");
|
||||
for (i, name) in cx.current.iter().take(parentlen).enumerate() {
|
||||
if i > 0 {
|
||||
buffer.write_str("::<wbr>");
|
||||
}
|
||||
write!(
|
||||
buffer,
|
||||
"<a href=\"{}index.html\">{}</a>",
|
||||
&cx.root_path()[..(cx.current.len() - i - 1) * 3],
|
||||
*name
|
||||
);
|
||||
}
|
||||
buffer.write_str("</h2>");
|
||||
let path: String = cx.current.iter().map(|s| s.as_str()).intersperse("::").collect();
|
||||
|
||||
write!(buffer, "<h2 class=\"location\"><a href=\"index.html\">In {}</a></h2>", path);
|
||||
}
|
||||
|
||||
// Sidebar refers to the enclosing module, not this module.
|
||||
|
|
|
|||
|
|
@ -1336,6 +1336,7 @@ h3.variant {
|
|||
margin-bottom: 13px;
|
||||
font-size: 1.1875rem;
|
||||
font-weight: 600;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.notable-traits .docblock code.content{
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
// Test that `-Z instrument-coverage` with `-Z dump-mir-graphviz` generates a graphviz (.dot file)
|
||||
// Test that `-C instrument-coverage` with `-Z dump-mir-graphviz` generates a graphviz (.dot file)
|
||||
// rendering of the `BasicCoverageBlock` coverage control flow graph, with counters and
|
||||
// expressions.
|
||||
|
||||
// needs-profiler-support
|
||||
// compile-flags: -Z instrument-coverage -Z dump-mir-graphviz
|
||||
// compile-flags: -C instrument-coverage -Z dump-mir-graphviz
|
||||
// EMIT_MIR coverage_graphviz.main.InstrumentCoverage.0.dot
|
||||
// EMIT_MIR coverage_graphviz.bar.InstrumentCoverage.0.dot
|
||||
fn main() {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
// Test that `-Z instrument-coverage` injects Coverage statements. The Coverage Counter statements
|
||||
// Test that `-C instrument-coverage` injects Coverage statements. The Coverage Counter statements
|
||||
// are later converted into LLVM instrprof.increment intrinsics, during codegen.
|
||||
|
||||
// needs-profiler-support
|
||||
// ignore-windows
|
||||
// compile-flags: -Z instrument-coverage --remap-path-prefix={{src-base}}=/the/src
|
||||
// compile-flags: -C instrument-coverage --remap-path-prefix={{src-base}}=/the/src
|
||||
|
||||
// EMIT_MIR instrument_coverage.main.InstrumentCoverage.diff
|
||||
// EMIT_MIR instrument_coverage.bar.InstrumentCoverage.diff
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ all: test_llvm_ir
|
|||
test_llvm_ir:
|
||||
# Compile the test program with non-experimental coverage instrumentation, and generate LLVM IR
|
||||
$(RUSTC) $(BASEDIR)/testprog.rs \
|
||||
-Zinstrument-coverage \
|
||||
-Cinstrument-coverage \
|
||||
--emit=llvm-ir
|
||||
|
||||
cat "$(TMPDIR)"/testprog.ll | \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Check for metadata, variables, declarations, and function definitions injected
|
||||
# into LLVM IR when compiling with -Zinstrument-coverage.
|
||||
# into LLVM IR when compiling with -Cinstrument-coverage.
|
||||
|
||||
WINDOWS: $__llvm_profile_runtime_user = comdat any
|
||||
|
||||
|
|
|
|||
|
|
@ -81,13 +81,13 @@ endif
|
|||
# Compile the test library with coverage instrumentation
|
||||
$(RUSTC) $(SOURCEDIR)/lib/$@.rs \
|
||||
$$( sed -n 's/^\/\/ compile-flags: \([^#]*\).*/\1/p' $(SOURCEDIR)/lib/$@.rs ) \
|
||||
--crate-type rlib -Zinstrument-coverage
|
||||
--crate-type rlib -Cinstrument-coverage
|
||||
|
||||
%: $(SOURCEDIR)/%.rs
|
||||
# Compile the test program with coverage instrumentation
|
||||
$(RUSTC) $(SOURCEDIR)/$@.rs \
|
||||
$$( sed -n 's/^\/\/ compile-flags: \([^#]*\).*/\1/p' $(SOURCEDIR)/$@.rs ) \
|
||||
-L "$(TMPDIR)" -Zinstrument-coverage
|
||||
-L "$(TMPDIR)" -Cinstrument-coverage
|
||||
|
||||
# Run it in order to generate some profiling data,
|
||||
# with `LLVM_PROFILE_FILE=<profdata_file>` environment variable set to
|
||||
|
|
@ -109,7 +109,7 @@ endif
|
|||
LLVM_PROFILE_FILE="$(TMPDIR)"/$@-%p-%m.profraw \
|
||||
$(RUSTDOC) --crate-name workaround_for_79771 --test $(SOURCEDIR)/$@.rs \
|
||||
$$( sed -n 's/^\/\/ compile-flags: \([^#]*\).*/\1/p' $(SOURCEDIR)/$@.rs ) \
|
||||
-L "$(TMPDIR)" -Zinstrument-coverage \
|
||||
-L "$(TMPDIR)" -Cinstrument-coverage \
|
||||
-Z unstable-options --persist-doctests=$(TMPDIR)/rustdoc-$@
|
||||
|
||||
# Postprocess the profiling data so it can be used by the llvm-cov tool
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
10| 1|}
|
||||
|
||||
../coverage/lib/inline_always_with_dead_code.rs:
|
||||
1| |// compile-flags: -Zinstrument-coverage -Ccodegen-units=4 -Copt-level=0
|
||||
1| |// compile-flags: -Cinstrument-coverage -Ccodegen-units=4 -Copt-level=0
|
||||
2| |
|
||||
3| |#![allow(dead_code)]
|
||||
4| |
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
78| |// generic functions with:
|
||||
79| |//
|
||||
80| |// ```shell
|
||||
81| |// $ `rustc -Z instrument-coverage=except-unused-generics ...`
|
||||
81| |// $ `rustc -Zunstable-options -C instrument-coverage=except-unused-generics ...`
|
||||
82| |// ```
|
||||
83| |//
|
||||
84| |// Even though this function is used by `uses_crate.rs` (and
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// compile-flags: -Zinstrument-coverage -Ccodegen-units=4 -Copt-level=0
|
||||
// compile-flags: -Cinstrument-coverage -Ccodegen-units=4 -Copt-level=0
|
||||
|
||||
#![allow(dead_code)]
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ fn use_this_lib_crate() {
|
|||
// generic functions with:
|
||||
//
|
||||
// ```shell
|
||||
// $ `rustc -Z instrument-coverage=except-unused-generics ...`
|
||||
// $ `rustc -Zunstable-options -C instrument-coverage=except-unused-generics ...`
|
||||
// ```
|
||||
//
|
||||
// Even though this function is used by `uses_crate.rs` (and
|
||||
|
|
|
|||
|
|
@ -77,12 +77,12 @@ struct AsyncFdReadyGuard<'a, T> { x: &'a T }
|
|||
|
||||
impl Foo {
|
||||
// @has async_fn/struct.Foo.html
|
||||
// @has - '//div[@class="method has-srclink"]' 'pub async fn complicated_lifetimes( &self, context: &impl Bar) -> impl Iterator<Item = &usize>'
|
||||
// @has - '//*[@class="method has-srclink"]' 'pub async fn complicated_lifetimes( &self, context: &impl Bar) -> impl Iterator<Item = &usize>'
|
||||
pub async fn complicated_lifetimes(&self, context: &impl Bar) -> impl Iterator<Item = &usize> {}
|
||||
// taken from `tokio` as an example of a method that was particularly bad before
|
||||
// @has - '//div[@class="method has-srclink"]' "pub async fn readable<T>(&self) -> Result<AsyncFdReadyGuard<'_, T>, ()>"
|
||||
// @has - '//*[@class="method has-srclink"]' "pub async fn readable<T>(&self) -> Result<AsyncFdReadyGuard<'_, T>, ()>"
|
||||
pub async fn readable<T>(&self) -> Result<AsyncFdReadyGuard<'_, T>, ()> {}
|
||||
// @has - '//div[@class="method has-srclink"]' "pub async fn mut_self(&mut self)"
|
||||
// @has - '//*[@class="method has-srclink"]' "pub async fn mut_self(&mut self)"
|
||||
pub async fn mut_self(&mut self) {}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#![feature(auto_traits)]
|
||||
|
||||
// @has auto_aliases/trait.Bar.html '//div[@data-aliases="auto_aliases::Foo"]' 'impl Bar for Foo'
|
||||
// @has auto_aliases/trait.Bar.html '//*[@data-aliases="auto_aliases::Foo"]' 'impl Bar for Foo'
|
||||
pub struct Foo;
|
||||
|
||||
pub auto trait Bar {}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#![crate_name = "foo"]
|
||||
|
||||
// @has foo/struct.S.html '//div[@id="impl-Into%3CU%3E"]//h3[@class="code-header in-band"]' 'impl<T, U> Into<U> for T'
|
||||
// @has foo/struct.S.html '//*[@id="impl-Into%3CU%3E"]//h3[@class="code-header in-band"]' 'impl<T, U> Into<U> for T'
|
||||
pub struct S2 {}
|
||||
mod m {
|
||||
pub struct S {}
|
||||
|
|
|
|||
|
|
@ -49,19 +49,19 @@ pub const unsafe fn bar_not_gated() -> u32 { 42 }
|
|||
pub struct Foo;
|
||||
|
||||
impl Foo {
|
||||
// @has 'foo/struct.Foo.html' '//div[@id="method.gated"]/h4[@class="code-header"]' 'pub fn gated() -> u32'
|
||||
// @has 'foo/struct.Foo.html' '//*[@id="method.gated"]/h4[@class="code-header"]' 'pub fn gated() -> u32'
|
||||
// @has - '//span[@class="since"]' '1.0.0 (const: unstable)'
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[rustc_const_unstable(feature="foo", issue = "none")]
|
||||
pub const fn gated() -> u32 { 42 }
|
||||
|
||||
// @has 'foo/struct.Foo.html' '//div[@id="method.gated_unsafe"]/h4[@class="code-header"]' 'pub unsafe fn gated_unsafe() -> u32'
|
||||
// @has 'foo/struct.Foo.html' '//*[@id="method.gated_unsafe"]/h4[@class="code-header"]' 'pub unsafe fn gated_unsafe() -> u32'
|
||||
// @has - '//span[@class="since"]' '1.0.0 (const: unstable)'
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[rustc_const_unstable(feature="foo", issue = "none")]
|
||||
pub const unsafe fn gated_unsafe() -> u32 { 42 }
|
||||
|
||||
// @has 'foo/struct.Foo.html' '//div[@id="method.stable_impl"]/h4[@class="code-header"]' 'pub const fn stable_impl() -> u32'
|
||||
// @has 'foo/struct.Foo.html' '//*[@id="method.stable_impl"]/h4[@class="code-header"]' 'pub const fn stable_impl() -> u32'
|
||||
// @has - '//span[@class="since"]' '1.0.0 (const: 1.2.0)'
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[rustc_const_stable(feature = "rust1", since = "1.2.0")]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ pub struct Simd<T, const WIDTH: usize> {
|
|||
inner: T,
|
||||
}
|
||||
|
||||
// @has foo/struct.Simd.html '//div[@id="trait-implementations-list"]//div/h3[@class="code-header in-band"]' 'impl Add<Simd<u8, 16_usize>> for Simd<u8, 16>'
|
||||
// @has foo/struct.Simd.html '//div[@id="trait-implementations-list"]//h3[@class="code-header in-band"]' 'impl Add<Simd<u8, 16_usize>> for Simd<u8, 16>'
|
||||
impl Add for Simd<u8, 16> {
|
||||
type Output = Self;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ pub trait Array {
|
|||
}
|
||||
|
||||
// @has foo/trait.Array.html
|
||||
// @has - '//div[@class="impl has-srclink"]' 'impl<T, const N: usize> Array for [T; N]'
|
||||
impl <T, const N: usize> Array for [T; N] {
|
||||
// @has - '//*[@class="impl has-srclink"]' 'impl<T, const N: usize> Array for [T; N]'
|
||||
impl<T, const N: usize> Array for [T; N] {
|
||||
type Item = T;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ pub struct Foo<const N: usize> where u8: Trait<N>;
|
|||
// @has foo/struct.Bar.html '//pre[@class="rust struct"]' 'pub struct Bar<T, const N: usize>(_)'
|
||||
pub struct Bar<T, const N: usize>([T; N]);
|
||||
|
||||
// @has foo/struct.Foo.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl<const M: usize> Foo<M> where u8: Trait<M>'
|
||||
// @has foo/struct.Foo.html '//*[@id="impl"]/h3[@class="code-header in-band"]' 'impl<const M: usize> Foo<M> where u8: Trait<M>'
|
||||
impl<const M: usize> Foo<M> where u8: Trait<M> {
|
||||
// @has - '//*[@id="associatedconstant.FOO_ASSOC"]' 'pub const FOO_ASSOC: usize'
|
||||
pub const FOO_ASSOC: usize = M + 13;
|
||||
|
|
@ -47,7 +47,7 @@ impl<const M: usize> Foo<M> where u8: Trait<M> {
|
|||
}
|
||||
}
|
||||
|
||||
// @has foo/struct.Bar.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl<const M: usize> Bar<u8, M>'
|
||||
// @has foo/struct.Bar.html '//*[@id="impl"]/h3[@class="code-header in-band"]' 'impl<const M: usize> Bar<u8, M>'
|
||||
impl<const M: usize> Bar<u8, M> {
|
||||
// @has - '//*[@id="method.hey"]' \
|
||||
// 'pub fn hey<const N: usize>(&self) -> Foo<N> where u8: Trait<N>'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
#![allow(incomplete_features)]
|
||||
|
||||
#![feature(adt_const_params)]
|
||||
|
||||
#![crate_name = "foo"]
|
||||
|
||||
#[derive(PartialEq, Eq)]
|
||||
|
|
@ -11,20 +9,20 @@ pub enum Order {
|
|||
}
|
||||
|
||||
// @has foo/struct.VSet.html '//pre[@class="rust struct"]' 'pub struct VSet<T, const ORDER: Order>'
|
||||
// @has foo/struct.VSet.html '//div[@id="impl-Send"]/h3[@class="code-header in-band"]' 'impl<T, const ORDER: Order> Send for VSet<T, ORDER>'
|
||||
// @has foo/struct.VSet.html '//div[@id="impl-Sync"]/h3[@class="code-header in-band"]' 'impl<T, const ORDER: Order> Sync for VSet<T, ORDER>'
|
||||
// @has foo/struct.VSet.html '//*[@id="impl-Send"]/h3[@class="code-header in-band"]' 'impl<T, const ORDER: Order> Send for VSet<T, ORDER>'
|
||||
// @has foo/struct.VSet.html '//*[@id="impl-Sync"]/h3[@class="code-header in-band"]' 'impl<T, const ORDER: Order> Sync for VSet<T, ORDER>'
|
||||
pub struct VSet<T, const ORDER: Order> {
|
||||
inner: Vec<T>,
|
||||
}
|
||||
|
||||
// @has foo/struct.VSet.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, { Order::Sorted }>'
|
||||
// @has foo/struct.VSet.html '//*[@id="impl"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, { Order::Sorted }>'
|
||||
impl<T> VSet<T, { Order::Sorted }> {
|
||||
pub fn new() -> Self {
|
||||
Self { inner: Vec::new() }
|
||||
}
|
||||
}
|
||||
|
||||
// @has foo/struct.VSet.html '//div[@id="impl-1"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, { Order::Unsorted }>'
|
||||
// @has foo/struct.VSet.html '//*[@id="impl-1"]/h3[@class="code-header in-band"]' 'impl<T> VSet<T, { Order::Unsorted }>'
|
||||
impl<T> VSet<T, { Order::Unsorted }> {
|
||||
pub fn new() -> Self {
|
||||
Self { inner: Vec::new() }
|
||||
|
|
@ -33,7 +31,7 @@ impl<T> VSet<T, { Order::Unsorted }> {
|
|||
|
||||
pub struct Escape<const S: &'static str>;
|
||||
|
||||
// @has foo/struct.Escape.html '//div[@id="impl"]/h3[@class="code-header in-band"]' 'impl Escape<r#"<script>alert("Escape");</script>"#>'
|
||||
// @has foo/struct.Escape.html '//*[@id="impl"]/h3[@class="code-header in-band"]' 'impl Escape<r#"<script>alert("Escape");</script>"#>'
|
||||
impl Escape<r#"<script>alert("Escape");</script>"#> {
|
||||
pub fn f() {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
#![crate_name = "foo"]
|
||||
|
||||
// @has foo/struct.Foo.html
|
||||
// @has - '//div[@id="synthetic-implementations-list"]/div[@id="impl-Send"]' 'impl Send for Foo'
|
||||
// @has - '//div[@id="synthetic-implementations-list"]/*[@id="impl-Send"]' 'impl Send for Foo'
|
||||
pub struct Foo;
|
||||
|
||||
pub trait EmptyTrait {}
|
||||
|
||||
// @has - '//div[@id="trait-implementations-list"]/div[@id="impl-EmptyTrait"]' 'impl EmptyTrait for Foo'
|
||||
// @has - '//div[@id="trait-implementations-list"]/*[@id="impl-EmptyTrait"]' 'impl EmptyTrait for Foo'
|
||||
impl EmptyTrait for Foo {}
|
||||
|
||||
pub trait NotEmpty {
|
||||
fn foo(&self);
|
||||
}
|
||||
|
||||
// @has - '//div[@id="trait-implementations-list"]/details/summary/div[@id="impl-NotEmpty"]' 'impl NotEmpty for Foo'
|
||||
// @has - '//div[@id="trait-implementations-list"]/details/summary/*[@id="impl-NotEmpty"]' 'impl NotEmpty for Foo'
|
||||
impl NotEmpty for Foo {
|
||||
fn foo(&self) {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
|
||||
// This test ensures that the [src] link is present on traits items.
|
||||
|
||||
// @has foo/trait.Iterator.html '//div[@id="method.zip"]//a[@class="srclink"]' "source"
|
||||
// @has foo/trait.Iterator.html '//*[@id="method.zip"]//a[@class="srclink"]' "source"
|
||||
pub use std::iter::Iterator;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
extern crate rustdoc_extern_default_method as ext;
|
||||
|
||||
// @count extern_default_method/struct.Struct.html '//*[@id="method.provided"]' 1
|
||||
// @has extern_default_method/struct.Struct.html '//div[@id="method.provided"]//a[@class="fnname"]/@href' #method.provided
|
||||
// @has extern_default_method/struct.Struct.html '//div[@id="method.provided"]//a[@class="anchor"]/@href' #method.provided
|
||||
// @has extern_default_method/struct.Struct.html '//*[@id="method.provided"]//a[@class="fnname"]/@href' #method.provided
|
||||
// @has extern_default_method/struct.Struct.html '//*[@id="method.provided"]//a[@class="anchor"]/@href' #method.provided
|
||||
pub use ext::Struct;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
use std::fmt;
|
||||
|
||||
// @!has foo/struct.Bar.html '//div[@id="impl-ToString"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
|
||||
// @!has foo/struct.Bar.html '//*[@id="impl-ToString"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
|
||||
pub struct Bar;
|
||||
|
||||
// @has foo/struct.Foo.html '//div[@id="impl-ToString"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
|
||||
// @has foo/struct.Foo.html '//*[@id="impl-ToString"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
|
||||
pub struct Foo;
|
||||
// @has foo/struct.Foo.html '//div[@class="sidebar-links"]/a[@href="#impl-ToString"]' 'ToString'
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,14 @@ pub trait MyTrait {
|
|||
fn my_string(&self) -> String;
|
||||
}
|
||||
|
||||
// @has - "//div[@id='implementors-list']//div[@id='impl-MyTrait']//h3[@class='code-header in-band']" "impl<T> MyTrait for T where T: Debug"
|
||||
impl<T> MyTrait for T where T: fmt::Debug {
|
||||
// @has - "//div[@id='implementors-list']//*[@id='impl-MyTrait']//h3[@class='code-header in-band']" "impl<T> MyTrait for T where T: Debug"
|
||||
impl<T> MyTrait for T
|
||||
where
|
||||
T: fmt::Debug,
|
||||
{
|
||||
fn my_string(&self) -> String {
|
||||
format!("{:?}", self)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main() {
|
||||
}
|
||||
pub fn main() {}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
// Ensure constant and array length values are not taken from source
|
||||
// code, which wreaks havoc with macros.
|
||||
|
||||
|
||||
macro_rules! make {
|
||||
($n:expr) => {
|
||||
pub struct S;
|
||||
|
|
@ -23,7 +22,7 @@ macro_rules! make {
|
|||
}
|
||||
|
||||
// @has issue_33302/struct.S.html \
|
||||
// '//div[@class="impl has-srclink"]' 'impl T<[i32; 16]> for S'
|
||||
// '//*[@class="impl has-srclink"]' 'impl T<[i32; 16]> for S'
|
||||
// @has - '//*[@id="associatedconstant.C"]' 'const C: [i32; 16]'
|
||||
// @has - '//*[@id="associatedconstant.D"]' 'const D: i32'
|
||||
impl T<[i32; ($n * $n)]> for S {
|
||||
|
|
@ -31,7 +30,7 @@ macro_rules! make {
|
|||
}
|
||||
|
||||
// @has issue_33302/struct.S.html \
|
||||
// '//div[@class="impl has-srclink"]' 'impl T<[i32; 16]> for S'
|
||||
// '//*[@class="impl has-srclink"]' 'impl T<[i32; 16]> for S'
|
||||
// @has - '//*[@id="associatedconstant.C-1"]' 'const C: (i32,)'
|
||||
// @has - '//*[@id="associatedconstant.D-1"]' 'const D: i32'
|
||||
impl T<(i32,)> for S {
|
||||
|
|
@ -39,14 +38,14 @@ macro_rules! make {
|
|||
}
|
||||
|
||||
// @has issue_33302/struct.S.html \
|
||||
// '//div[@class="impl has-srclink"]' 'impl T<(i32, i32)> for S'
|
||||
// '//*[@class="impl has-srclink"]' 'impl T<(i32, i32)> for S'
|
||||
// @has - '//*[@id="associatedconstant.C-2"]' 'const C: (i32, i32)'
|
||||
// @has - '//*[@id="associatedconstant.D-2"]' 'const D: i32'
|
||||
impl T<(i32, i32)> for S {
|
||||
const C: (i32, i32) = ($n, $n);
|
||||
const D: i32 = ($n / $n);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
make!(4);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
pub trait MyIterator {
|
||||
}
|
||||
pub trait MyIterator {}
|
||||
|
||||
pub struct MyStruct<T>(T);
|
||||
|
||||
|
|
@ -13,9 +12,9 @@ macro_rules! array_impls {
|
|||
}
|
||||
|
||||
// @has issue_53812/trait.MyIterator.html
|
||||
// @has - '//*[@id="implementors-list"]/div[@class="impl has-srclink"][1]' 'MyStruct<[T; 0]>'
|
||||
// @has - '//*[@id="implementors-list"]/div[@class="impl has-srclink"][2]' 'MyStruct<[T; 1]>'
|
||||
// @has - '//*[@id="implementors-list"]/div[@class="impl has-srclink"][3]' 'MyStruct<[T; 2]>'
|
||||
// @has - '//*[@id="implementors-list"]/div[@class="impl has-srclink"][4]' 'MyStruct<[T; 3]>'
|
||||
// @has - '//*[@id="implementors-list"]/div[@class="impl has-srclink"][5]' 'MyStruct<[T; 10]>'
|
||||
// @has - '//*[@id="implementors-list"]/*[@class="impl has-srclink"][1]' 'MyStruct<[T; 0]>'
|
||||
// @has - '//*[@id="implementors-list"]/*[@class="impl has-srclink"][2]' 'MyStruct<[T; 1]>'
|
||||
// @has - '//*[@id="implementors-list"]/*[@class="impl has-srclink"][3]' 'MyStruct<[T; 2]>'
|
||||
// @has - '//*[@id="implementors-list"]/*[@class="impl has-srclink"][4]' 'MyStruct<[T; 3]>'
|
||||
// @has - '//*[@id="implementors-list"]/*[@class="impl has-srclink"][5]' 'MyStruct<[T; 10]>'
|
||||
array_impls! { 10 3 2 1 0 }
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@ extern crate issue_86620_1;
|
|||
|
||||
use issue_86620_1::*;
|
||||
|
||||
// @!has issue_86620/struct.S.html '//div[@id="method.vzip"]//a[@class="fnname"]/@href' #tymethod.vzip
|
||||
// @has issue_86620/struct.S.html '//div[@id="method.vzip"]//a[@class="anchor"]/@href' #method.vzip
|
||||
// @!has issue_86620/struct.S.html '//*[@id="method.vzip"]//a[@class="fnname"]/@href' #tymethod.vzip
|
||||
// @has issue_86620/struct.S.html '//*[@id="method.vzip"]//a[@class="anchor"]/@href' #method.vzip
|
||||
pub struct S;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
#![feature(rustdoc_internals)]
|
||||
|
||||
#![crate_name = "foo"]
|
||||
|
||||
// @has foo/primitive.i32.html '//div[@id="impl-ToString"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
|
||||
// @has foo/primitive.i32.html '//*[@id="impl-ToString"]//h3[@class="code-header in-band"]' 'impl<T> ToString for T'
|
||||
|
||||
#[doc(primitive = "i32")]
|
||||
/// Some useless docs, wouhou!
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
// @has - '//*[@class="sidebar-title"]/a[@href="#foreign-impls"]' 'Implementations on Foreign Types'
|
||||
// @has - '//h2[@id="foreign-impls"]' 'Implementations on Foreign Types'
|
||||
// @has - '//*[@class="sidebar-links"]/a[@href="#impl-Foo-for-u32"]' 'u32'
|
||||
// @has - '//div[@id="impl-Foo-for-u32"]//h3[@class="code-header in-band"]' 'impl Foo for u32'
|
||||
// @has - '//*[@id="impl-Foo-for-u32"]//h3[@class="code-header in-band"]' 'impl Foo for u32'
|
||||
// @has - '//*[@class="sidebar-links"]/a[@href="#impl-Foo-for-%26%27a%20str"]' "&'a str"
|
||||
// @has - '//div[@id="impl-Foo-for-%26%27a%20str"]//h3[@class="code-header in-band"]' "impl<'a> Foo for &'a str"
|
||||
// @has - '//*[@id="impl-Foo-for-%26%27a%20str"]//h3[@class="code-header in-band"]' "impl<'a> Foo for &'a str"
|
||||
pub trait Foo {}
|
||||
|
||||
impl Foo for u32 {}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
#![crate_name = "foo"]
|
||||
|
||||
// @has foo/struct.Bar.html
|
||||
// @!has - '//div[@id="impl-Sized"]'
|
||||
// @!has - '//*[@id="impl-Sized"]'
|
||||
pub struct Bar {
|
||||
a: u16,
|
||||
}
|
||||
|
||||
// @has foo/struct.Foo.html
|
||||
// @!has - '//div[@id="impl-Sized"]'
|
||||
// @!has - '//*[@id="impl-Sized"]'
|
||||
pub struct Foo<T: ?Sized>(T);
|
||||
|
||||
// @has foo/struct.Unsized.html
|
||||
// @has - '//div[@id="impl-Sized"]//h3[@class="code-header in-band"]' 'impl !Sized for Unsized'
|
||||
// @has - '//*[@id="impl-Sized"]//h3[@class="code-header in-band"]' 'impl !Sized for Unsized'
|
||||
pub struct Unsized {
|
||||
data: [u8],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
// @has - '//div[@class="main-heading"]/*[@class="out-of-band"]' '1.0 · source · '
|
||||
#[stable(feature = "bar", since = "1.0")]
|
||||
pub trait Bar {
|
||||
// @has - '//div[@id="tymethod.foo"]/*[@class="rightside"]' '3.0 · source'
|
||||
// @has - '//*[@id="tymethod.foo"]/*[@class="rightside"]' '3.0 · source'
|
||||
#[stable(feature = "foobar", since = "3.0")]
|
||||
fn foo();
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ pub trait Bar {
|
|||
pub struct Foo;
|
||||
|
||||
impl Foo {
|
||||
// @has - '//div[@id="method.foofoo"]/*[@class="rightside"]' '3.0 · source'
|
||||
// @has - '//*[@id="method.foofoo"]/*[@class="rightside"]' '3.0 · source'
|
||||
#[stable(feature = "foobar", since = "3.0")]
|
||||
pub fn foofoo() {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
use std::iter::Iterator;
|
||||
|
||||
// @has foo/struct.Odd.html
|
||||
// @has - '//div[@id="method.new"]//span[@class="notable-traits"]//code/span' 'impl Iterator for Odd'
|
||||
// @has - '//*[@id="method.new"]//span[@class="notable-traits"]//code/span' 'impl Iterator for Odd'
|
||||
pub struct Odd {
|
||||
current: usize,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
#![crate_name = "foo"]
|
||||
|
||||
// @has foo/struct.Unsized.html
|
||||
// @has - '//div[@id="impl-Sized"]/h3[@class="code-header in-band"]' 'impl !Sized for Unsized'
|
||||
// @!has - '//div[@id="impl-Sized"]//a[@class="srclink"]' 'source'
|
||||
// @has - '//div[@id="impl-Sync"]/h3[@class="code-header in-band"]' 'impl Sync for Unsized'
|
||||
// @!has - '//div[@id="impl-Sync"]//a[@class="srclink"]' 'source'
|
||||
// @has - '//div[@id="impl-Any"]/h3[@class="code-header in-band"]' 'impl<T> Any for T'
|
||||
// @has - '//div[@id="impl-Any"]//a[@class="srclink"]' 'source'
|
||||
// @has - '//*[@id="impl-Sized"]/h3[@class="code-header in-band"]' 'impl !Sized for Unsized'
|
||||
// @!has - '//*[@id="impl-Sized"]//a[@class="srclink"]' 'source'
|
||||
// @has - '//*[@id="impl-Sync"]/h3[@class="code-header in-band"]' 'impl Sync for Unsized'
|
||||
// @!has - '//*[@id="impl-Sync"]//a[@class="srclink"]' 'source'
|
||||
// @has - '//*[@id="impl-Any"]/h3[@class="code-header in-band"]' 'impl<T> Any for T'
|
||||
// @has - '//*[@id="impl-Any"]//a[@class="srclink"]' 'source'
|
||||
pub struct Unsized {
|
||||
data: [u8],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,52 +7,52 @@ pub trait MyTrait {
|
|||
}
|
||||
|
||||
impl MyTrait for String {
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedtype.Assoc-1"]//a[@class="associatedtype"]/@href' #associatedtype.Assoc
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedtype.Assoc-1"]//a[@class="anchor"]/@href' #associatedtype.Assoc-1
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedtype.Assoc-1"]//a[@class="associatedtype"]/@href' #associatedtype.Assoc
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedtype.Assoc-1"]//a[@class="anchor"]/@href' #associatedtype.Assoc-1
|
||||
type Assoc = ();
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-1"]//a[@class="constant"]/@href' #associatedconstant.VALUE
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-1"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-1
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedconstant.VALUE-1"]//a[@class="constant"]/@href' #associatedconstant.VALUE
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedconstant.VALUE-1"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-1
|
||||
const VALUE: u32 = 5;
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' #tymethod.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="anchor"]/@href' #method.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.trait_function"]//a[@class="fnname"]/@href' #tymethod.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.trait_function"]//a[@class="anchor"]/@href' #method.trait_function
|
||||
fn trait_function(&self) {}
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.defaulted_override-1"]//a[@class="fnname"]/@href' #method.defaulted_override
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.defaulted_override-1"]//a[@class="anchor"]/@href' #method.defaulted_override-1
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.defaulted_override-1"]//a[@class="fnname"]/@href' #method.defaulted_override
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.defaulted_override-1"]//a[@class="anchor"]/@href' #method.defaulted_override-1
|
||||
fn defaulted_override(&self) {}
|
||||
}
|
||||
|
||||
impl MyTrait for Vec<u8> {
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedtype.Assoc-2"]//a[@class="associatedtype"]/@href' #associatedtype.Assoc
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedtype.Assoc-2"]//a[@class="anchor"]/@href' #associatedtype.Assoc-2
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedtype.Assoc-2"]//a[@class="associatedtype"]/@href' #associatedtype.Assoc
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedtype.Assoc-2"]//a[@class="anchor"]/@href' #associatedtype.Assoc-2
|
||||
type Assoc = ();
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-2"]//a[@class="constant"]/@href' #associatedconstant.VALUE
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-2"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-2
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedconstant.VALUE-2"]//a[@class="constant"]/@href' #associatedconstant.VALUE
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedconstant.VALUE-2"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-2
|
||||
const VALUE: u32 = 5;
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' #tymethod.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function-1"]//a[@class="anchor"]/@href' #method.trait_function-1
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.trait_function"]//a[@class="fnname"]/@href' #tymethod.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.trait_function-1"]//a[@class="anchor"]/@href' #method.trait_function-1
|
||||
fn trait_function(&self) {}
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.defaulted_override-2"]//a[@class="fnname"]/@href' #method.defaulted_override
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.defaulted_override-2"]//a[@class="anchor"]/@href' #method.defaulted_override-2
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.defaulted_override-2"]//a[@class="fnname"]/@href' #method.defaulted_override
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="method.defaulted_override-2"]//a[@class="anchor"]/@href' #method.defaulted_override-2
|
||||
fn defaulted_override(&self) {}
|
||||
}
|
||||
|
||||
impl MyTrait for MyStruct {
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedtype.Assoc-3"]//a[@class="anchor"]/@href' #associatedtype.Assoc-3
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="associatedtype.Assoc"]//a[@class="associatedtype"]/@href' trait.MyTrait.html#associatedtype.Assoc
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="associatedtype.Assoc"]//a[@class="anchor"]/@href' #associatedtype.Assoc
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedtype.Assoc-3"]//a[@class="anchor"]/@href' #associatedtype.Assoc-3
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="associatedtype.Assoc"]//a[@class="associatedtype"]/@href' trait.MyTrait.html#associatedtype.Assoc
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="associatedtype.Assoc"]//a[@class="anchor"]/@href' #associatedtype.Assoc
|
||||
type Assoc = bool;
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-3"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-3
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="associatedconstant.VALUE"]//a[@class="constant"]/@href' trait.MyTrait.html#associatedconstant.VALUE
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="associatedconstant.VALUE"]//a[@class="anchor"]/@href' #associatedconstant.VALUE
|
||||
// @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//*[@id="associatedconstant.VALUE-3"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-3
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="associatedconstant.VALUE"]//a[@class="constant"]/@href' trait.MyTrait.html#associatedconstant.VALUE
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="associatedconstant.VALUE"]//a[@class="anchor"]/@href' #associatedconstant.VALUE
|
||||
const VALUE: u32 = 20;
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' trait.MyTrait.html#tymethod.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.trait_function"]//a[@class="anchor"]/@href' #method.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="method.trait_function"]//a[@class="fnname"]/@href' trait.MyTrait.html#tymethod.trait_function
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="method.trait_function"]//a[@class="anchor"]/@href' #method.trait_function
|
||||
fn trait_function(&self) {}
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.defaulted_override"]//a[@class="fnname"]/@href' trait.MyTrait.html#method.defaulted_override
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.defaulted_override"]//a[@class="anchor"]/@href' #method.defaulted_override
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="method.defaulted_override"]//a[@class="fnname"]/@href' trait.MyTrait.html#method.defaulted_override
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="method.defaulted_override"]//a[@class="anchor"]/@href' #method.defaulted_override
|
||||
fn defaulted_override(&self) {}
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.defaulted"]//a[@class="fnname"]/@href' trait.MyTrait.html#method.defaulted
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.defaulted"]//a[@class="anchor"]/@href' #method.defaulted
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="method.defaulted"]//a[@class="fnname"]/@href' trait.MyTrait.html#method.defaulted
|
||||
// @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//*[@id="method.defaulted"]//a[@class="anchor"]/@href' #method.defaulted
|
||||
}
|
||||
|
||||
pub struct MyStruct;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ pub fn foo() {}
|
|||
pub struct Bar;
|
||||
|
||||
impl Bar {
|
||||
// @has - '//div[@id="method.bar"]/*[@class="rightside"]' '2.0'
|
||||
// @!has - '//div[@id="method.bar"]/*[@class="rightside"]' '2.0 ·'
|
||||
// @has - '//*[@id="method.bar"]/*[@class="rightside"]' '2.0'
|
||||
// @!has - '//*[@id="method.bar"]/*[@class="rightside"]' '2.0 ·'
|
||||
#[stable(feature = "foobar", since = "2.0")]
|
||||
pub fn bar() {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
#![crate_name = "foo"]
|
||||
|
||||
pub trait SomeTrait<Rhs = Self>
|
||||
where Rhs: ?Sized
|
||||
{}
|
||||
where
|
||||
Rhs: ?Sized,
|
||||
{
|
||||
}
|
||||
|
||||
// @has 'foo/trait.SomeTrait.html'
|
||||
// @has - "//div[@id='impl-SomeTrait%3C(A%2C%20B%2C%20C%2C%20D%2C%20E)%3E-for-(A%2C%20B%2C%20C%2C%20D%2C%20E)']/h3" "impl<A, B, C, D, E> SomeTrait<(A, B, C, D, E)> for (A, B, C, D, E) where A: PartialOrd<A> + PartialEq<A>, B: PartialOrd<B> + PartialEq<B>, C: PartialOrd<C> + PartialEq<C>, D: PartialOrd<D> + PartialEq<D>, E: PartialOrd<E> + PartialEq<E> + ?Sized, "
|
||||
impl<A, B, C, D, E> SomeTrait<(A, B, C, D, E)> for (A, B, C, D, E) where
|
||||
// @has - "//*[@id='impl-SomeTrait%3C(A%2C%20B%2C%20C%2C%20D%2C%20E)%3E-for-(A%2C%20B%2C%20C%2C%20D%2C%20E)']/h3" "impl<A, B, C, D, E> SomeTrait<(A, B, C, D, E)> for (A, B, C, D, E) where A: PartialOrd<A> + PartialEq<A>, B: PartialOrd<B> + PartialEq<B>, C: PartialOrd<C> + PartialEq<C>, D: PartialOrd<D> + PartialEq<D>, E: PartialOrd<E> + PartialEq<E> + ?Sized, "
|
||||
impl<A, B, C, D, E> SomeTrait<(A, B, C, D, E)> for (A, B, C, D, E)
|
||||
where
|
||||
A: PartialOrd<A> + PartialEq<A>,
|
||||
B: PartialOrd<B> + PartialEq<B>,
|
||||
C: PartialOrd<C> + PartialEq<C>,
|
||||
D: PartialOrd<D> + PartialEq<D>,
|
||||
E: PartialOrd<E> + PartialEq<E> + ?Sized
|
||||
{}
|
||||
E: PartialOrd<E> + PartialEq<E> + ?Sized,
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// compile-flags: -Zinstrument-coverage -Ccodegen-units=4 --crate-type dylib -Copt-level=0
|
||||
// compile-flags: -Cinstrument-coverage -Ccodegen-units=4 --crate-type dylib -Copt-level=0
|
||||
// build-pass
|
||||
// needs-profiler-support
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue