mirror of
https://github.com/rust-lang/rust
synced 2024-10-14 12:33:57 +00:00
Auto merge of #124026 - matthiaskrgr:rollup-an6s6gq, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #122632 (fetch submodule before checking llvm stamp) - #123355 (Support type '/' to search) - #123501 (Stabilize checking of cfgs at compile-time: `--check-cfg` option) - #123535 (Match ergonomics 2024: `mut` doesn't reset binding mode) - #123711 (drop `changelog-seen`) - #123969 (The new solver ignores `DefineOpaqueTypes`, so switch it to `Yes`) - #124007 (Miri subtree update) - #124017 (Change a diagnostics-path-only `DefineOpaqueTypes` to `Yes`.) - #124018 (interpret: pass MemoryKind to before_memory_deallocation) - #124024 (interpret: remove outdated comment) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
bors
commit
468f115684
|
|
@ -3364,9 +3364,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustc-build-sysroot"
|
||||
version = "0.4.5"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a26170e1d79ea32f7ccec3188dd13cfc1f18c82764a9cbc1071667c0f865a4ea"
|
||||
checksum = "a9bf37423495cd3a6a9ef8c75fc4566de0d26de0ab75f36f67a426e58df5768c"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"rustc_version",
|
||||
|
|
|
|||
|
|
@ -347,8 +347,6 @@ fn ptr_get_alloc(
|
|||
/// allocation (because a copy had to be done to adjust things), machine memory will
|
||||
/// cache the result. (This relies on `AllocMap::get_or` being able to add the
|
||||
/// owned allocation to the map even when the map is shared.)
|
||||
///
|
||||
/// This must only fail if `alloc` contains provenance.
|
||||
fn adjust_allocation<'b>(
|
||||
ecx: &InterpCx<'mir, 'tcx, Self>,
|
||||
id: AllocId,
|
||||
|
|
@ -427,6 +425,7 @@ fn before_memory_deallocation(
|
|||
_prov: (AllocId, Self::ProvenanceExtra),
|
||||
_size: Size,
|
||||
_align: Align,
|
||||
_kind: MemoryKind<Self::MemoryKind>,
|
||||
) -> InterpResult<'tcx> {
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -227,7 +227,6 @@ pub fn allocate_bytes_ptr(
|
|||
self.allocate_raw_ptr(alloc, kind)
|
||||
}
|
||||
|
||||
/// This can fail only if `alloc` contains provenance.
|
||||
pub fn allocate_raw_ptr(
|
||||
&mut self,
|
||||
alloc: Allocation,
|
||||
|
|
@ -355,6 +354,7 @@ pub fn deallocate_ptr(
|
|||
(alloc_id, prov),
|
||||
size,
|
||||
alloc.align,
|
||||
kind,
|
||||
)?;
|
||||
|
||||
// Don't forget to remember size and align of this now-dead allocation
|
||||
|
|
|
|||
|
|
@ -533,6 +533,8 @@ pub fn internal(&self, feature: Symbol) -> bool {
|
|||
(unstable, more_qualified_paths, "1.54.0", Some(86935)),
|
||||
/// Allows the `#[must_not_suspend]` attribute.
|
||||
(unstable, must_not_suspend, "1.57.0", Some(83310)),
|
||||
/// Make `mut` not reset the binding mode on edition >= 2024.
|
||||
(incomplete, mut_preserve_binding_mode_2024, "CURRENT_RUSTC_VERSION", Some(123076)),
|
||||
/// Allows `mut ref` and `mut ref mut` identifier patterns.
|
||||
(incomplete, mut_ref, "CURRENT_RUSTC_VERSION", Some(123076)),
|
||||
/// Allows using `#[naked]` on functions.
|
||||
|
|
|
|||
|
|
@ -46,6 +46,10 @@ hir_typeck_ctor_is_private = tuple struct constructor `{$def}` is private
|
|||
|
||||
hir_typeck_deref_is_empty = this expression `Deref`s to `{$deref_ty}` which implements `is_empty`
|
||||
|
||||
hir_typeck_dereferencing_mut_binding = dereferencing `mut` binding
|
||||
.label = `mut` dereferences the type of this binding
|
||||
.help = this will change in edition 2024
|
||||
|
||||
hir_typeck_expected_default_return_type = expected `()` because of default return type
|
||||
|
||||
hir_typeck_expected_return_type = expected `{$expected}` because of return type
|
||||
|
|
|
|||
|
|
@ -632,3 +632,11 @@ pub enum SuggestBoxingForReturnImplTrait {
|
|||
ends: Vec<Span>,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(LintDiagnostic)]
|
||||
#[diag(hir_typeck_dereferencing_mut_binding)]
|
||||
pub struct DereferencingMutBinding {
|
||||
#[label]
|
||||
#[help]
|
||||
pub span: Span,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1696,7 +1696,7 @@ fn consider_probe(
|
|||
if let ProbeResult::Match = result
|
||||
&& self
|
||||
.at(&ObligationCause::dummy(), self.param_env)
|
||||
.sup(DefineOpaqueTypes::No, return_ty, xform_ret_ty)
|
||||
.sup(DefineOpaqueTypes::Yes, return_ty, xform_ret_ty)
|
||||
.is_err()
|
||||
{
|
||||
result = ProbeResult::BadReturnType;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
use rustc_hir::{self as hir, BindingAnnotation, ByRef, HirId, Mutability, Pat, PatKind};
|
||||
use rustc_infer::infer;
|
||||
use rustc_infer::infer::type_variable::TypeVariableOrigin;
|
||||
use rustc_lint as lint;
|
||||
use rustc_middle::mir::interpret::ErrorHandled;
|
||||
use rustc_middle::ty::{self, Adt, Ty, TypeVisitableExt};
|
||||
use rustc_session::lint::builtin::NON_EXHAUSTIVE_OMITTED_PATTERNS;
|
||||
|
|
@ -629,12 +630,26 @@ fn check_pat_ident(
|
|||
expected: Ty<'tcx>,
|
||||
pat_info: PatInfo<'tcx, '_>,
|
||||
) -> Ty<'tcx> {
|
||||
let PatInfo { binding_mode: def_bm, top_info: ti, .. } = pat_info;
|
||||
let PatInfo { binding_mode: BindingAnnotation(def_br, _), top_info: ti, .. } = pat_info;
|
||||
|
||||
// Determine the binding mode...
|
||||
let bm = match ba {
|
||||
BindingAnnotation(ByRef::No, Mutability::Not) => def_bm,
|
||||
_ => ba,
|
||||
BindingAnnotation(ByRef::No, Mutability::Mut)
|
||||
if !(pat.span.at_least_rust_2024()
|
||||
&& self.tcx.features().mut_preserve_binding_mode_2024)
|
||||
&& matches!(def_br, ByRef::Yes(_)) =>
|
||||
{
|
||||
// `mut x` resets the binding mode in edition <= 2021.
|
||||
self.tcx.emit_node_span_lint(
|
||||
lint::builtin::DEREFERENCING_MUT_BINDING,
|
||||
pat.hir_id,
|
||||
pat.span,
|
||||
errors::DereferencingMutBinding { span: pat.span },
|
||||
);
|
||||
BindingAnnotation(ByRef::No, Mutability::Mut)
|
||||
}
|
||||
BindingAnnotation(ByRef::No, mutbl) => BindingAnnotation(def_br, mutbl),
|
||||
BindingAnnotation(ByRef::Yes(_), _) => ba,
|
||||
};
|
||||
// ...and store it in a side table:
|
||||
self.typeck_results.borrow_mut().pat_binding_modes_mut().insert(pat.hir_id, bm);
|
||||
|
|
@ -743,7 +758,7 @@ fn suggest_adding_missing_ref_or_removing_ref(
|
|||
}
|
||||
}
|
||||
|
||||
// Precondition: pat is a Ref(_) pattern
|
||||
/// Precondition: pat is a `Ref(_)` pattern
|
||||
fn borrow_pat_suggestion(&self, err: &mut Diag<'_>, pat: &Pat<'_>) {
|
||||
let tcx = self.tcx;
|
||||
if let PatKind::Ref(inner, mutbl) = pat.kind
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ pub fn eq_structurally_relating_aliases<T>(self, a: T, b: T) -> InferResult<'tcx
|
|||
{
|
||||
let Trace { at, trace } = self;
|
||||
debug_assert!(at.infcx.next_trait_solver());
|
||||
let mut fields = at.infcx.combine_fields(trace, at.param_env, DefineOpaqueTypes::No);
|
||||
let mut fields = at.infcx.combine_fields(trace, at.param_env, DefineOpaqueTypes::Yes);
|
||||
fields
|
||||
.equate(StructurallyRelateAliases::Yes)
|
||||
.relate(a, b)
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ pub(super) fn unexpected_cfg_name(
|
|||
diag.note("see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration");
|
||||
} else {
|
||||
diag.help(format!("to expect this configuration use `--check-cfg={inst}`"));
|
||||
diag.note("see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration");
|
||||
diag.note("see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -272,6 +272,6 @@ pub(super) fn unexpected_cfg_value(
|
|||
if !is_cfg_a_well_know_name {
|
||||
diag.help(format!("to expect this configuration use `--check-cfg={inst}`"));
|
||||
}
|
||||
diag.note("see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration");
|
||||
diag.note("see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
DEPRECATED_CFG_ATTR_CRATE_TYPE_NAME,
|
||||
DEPRECATED_IN_FUTURE,
|
||||
DEPRECATED_WHERE_CLAUSE_LOCATION,
|
||||
DEREFERENCING_MUT_BINDING,
|
||||
DUPLICATE_MACRO_ATTRIBUTES,
|
||||
ELIDED_LIFETIMES_IN_ASSOCIATED_CONSTANT,
|
||||
ELIDED_LIFETIMES_IN_PATHS,
|
||||
|
|
@ -1627,6 +1628,42 @@
|
|||
"detect mut variables which don't need to be mutable"
|
||||
}
|
||||
|
||||
declare_lint! {
|
||||
/// The `dereferencing_mut_binding` lint detects a `mut x` pattern that resets the binding mode,
|
||||
/// as this behavior will change in rust 2024.
|
||||
///
|
||||
/// ### Example
|
||||
///
|
||||
/// ```rust
|
||||
/// # #![warn(dereferencing_mut_binding)]
|
||||
/// let x = Some(123u32);
|
||||
/// let _y = match &x {
|
||||
/// Some(mut x) => {
|
||||
/// x += 1;
|
||||
/// x
|
||||
/// }
|
||||
/// None => 0,
|
||||
/// };
|
||||
/// ```
|
||||
///
|
||||
/// {{produces}}
|
||||
///
|
||||
/// ### Explanation
|
||||
///
|
||||
/// Without the `mut`, `x` would have type `&u32`. Pre-2024, adding `mut` makes `x` have type
|
||||
/// `u32`, which was deemed surprising. After edition 2024, adding `mut` will not change the
|
||||
/// type of `x`. This lint warns users of editions before 2024 to update their code.
|
||||
pub DEREFERENCING_MUT_BINDING,
|
||||
Allow,
|
||||
"detects `mut x` bindings that change the type of `x`",
|
||||
@feature_gate = sym::mut_preserve_binding_mode_2024;
|
||||
// FIXME uncomment below upon stabilization
|
||||
/*@future_incompatible = FutureIncompatibleInfo {
|
||||
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2024),
|
||||
reference: "123076",
|
||||
};*/
|
||||
}
|
||||
|
||||
declare_lint! {
|
||||
/// The `unconditional_recursion` lint detects functions that cannot
|
||||
/// return without calling themselves.
|
||||
|
|
|
|||
|
|
@ -1373,7 +1373,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
|
|||
opt::flag_s("h", "help", "Display this message"),
|
||||
opt::multi_s("", "cfg", "Configure the compilation environment.
|
||||
SPEC supports the syntax `NAME[=\"VALUE\"]`.", "SPEC"),
|
||||
opt::multi("", "check-cfg", "Provide list of valid cfg options for checking", "SPEC"),
|
||||
opt::multi_s("", "check-cfg", "Provide list of expected cfgs for checking", "SPEC"),
|
||||
opt::multi_s(
|
||||
"L",
|
||||
"",
|
||||
|
|
|
|||
|
|
@ -257,7 +257,7 @@ macro_rules! ins {
|
|||
// `tests/ui/check-cfg/well-known-values.rs` (in order to test the
|
||||
// expected values of the new config) and bless the all directory.
|
||||
//
|
||||
// Don't forget to update `src/doc/unstable-book/src/compiler-flags/check-cfg.md`
|
||||
// Don't forget to update `src/doc/rustc/src/check-cfg.md`
|
||||
// in the unstable book as well!
|
||||
|
||||
ins!(sym::debug_assertions, no_values);
|
||||
|
|
|
|||
|
|
@ -1194,6 +1194,7 @@
|
|||
multiple_supertrait_upcastable,
|
||||
must_not_suspend,
|
||||
must_use,
|
||||
mut_preserve_binding_mode_2024,
|
||||
mut_ref,
|
||||
naked,
|
||||
naked_functions,
|
||||
|
|
|
|||
|
|
@ -131,10 +131,6 @@ fn main() {
|
|||
fn check_version(config: &Config) -> Option<String> {
|
||||
let mut msg = String::new();
|
||||
|
||||
if config.changelog_seen.is_some() {
|
||||
msg.push_str("WARNING: The use of `changelog-seen` is deprecated. Please refer to `change-id` option in `config.example.toml` instead.\n");
|
||||
}
|
||||
|
||||
let latest_change_id = CONFIG_CHANGE_HISTORY.last().unwrap().change_id;
|
||||
let warned_id_path = config.out.join("bootstrap").join(".last-warned-change-id");
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,9 @@ pub fn prebuilt_llvm_config(
|
|||
builder: &Builder<'_>,
|
||||
target: TargetSelection,
|
||||
) -> Result<LlvmResult, Meta> {
|
||||
// If we have llvm submodule initialized already, sync it.
|
||||
builder.update_existing_submodule(&Path::new("src").join("llvm-project"));
|
||||
|
||||
builder.config.maybe_download_ci_llvm();
|
||||
|
||||
// If we're using a custom LLVM bail out here, but we can only use a
|
||||
|
|
@ -94,6 +97,9 @@ pub fn prebuilt_llvm_config(
|
|||
}
|
||||
}
|
||||
|
||||
// Initialize the llvm submodule if not initialized already.
|
||||
builder.update_submodule(&Path::new("src").join("llvm-project"));
|
||||
|
||||
let root = "src/llvm-project/llvm";
|
||||
let out_dir = builder.llvm_out(target);
|
||||
|
||||
|
|
@ -280,7 +286,6 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
|
|||
Err(m) => m,
|
||||
};
|
||||
|
||||
builder.update_submodule(&Path::new("src").join("llvm-project"));
|
||||
if builder.llvm_link_shared() && target.is_windows() {
|
||||
panic!("shared linking to LLVM is not currently supported on {}", target.triple);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,6 @@ pub fn is_used(&self) -> bool {
|
|||
/// `config.example.toml`.
|
||||
#[derive(Default, Clone)]
|
||||
pub struct Config {
|
||||
pub changelog_seen: Option<usize>, // FIXME: Deprecated field. Remove it at 2024.
|
||||
pub change_id: Option<usize>,
|
||||
pub bypass_bootstrap_lock: bool,
|
||||
pub ccache: Option<String>,
|
||||
|
|
@ -605,7 +604,6 @@ pub fn from_triple(triple: &str) -> Self {
|
|||
#[derive(Deserialize, Default)]
|
||||
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
|
||||
pub(crate) struct TomlConfig {
|
||||
changelog_seen: Option<usize>, // FIXME: Deprecated field. Remove it at 2024.
|
||||
#[serde(flatten)]
|
||||
change_id: ChangeIdWrapper,
|
||||
build: Option<Build>,
|
||||
|
|
@ -645,17 +643,7 @@ trait Merge {
|
|||
impl Merge for TomlConfig {
|
||||
fn merge(
|
||||
&mut self,
|
||||
TomlConfig {
|
||||
build,
|
||||
install,
|
||||
llvm,
|
||||
rust,
|
||||
dist,
|
||||
target,
|
||||
profile: _,
|
||||
changelog_seen,
|
||||
change_id,
|
||||
}: Self,
|
||||
TomlConfig { build, install, llvm, rust, dist, target, profile: _, change_id }: Self,
|
||||
replace: ReplaceOpt,
|
||||
) {
|
||||
fn do_merge<T: Merge>(x: &mut Option<T>, y: Option<T>, replace: ReplaceOpt) {
|
||||
|
|
@ -667,7 +655,6 @@ fn do_merge<T: Merge>(x: &mut Option<T>, y: Option<T>, replace: ReplaceOpt) {
|
|||
}
|
||||
}
|
||||
}
|
||||
self.changelog_seen.merge(changelog_seen, replace);
|
||||
self.change_id.inner.merge(change_id.inner, replace);
|
||||
do_merge(&mut self.build, build, replace);
|
||||
do_merge(&mut self.install, install, replace);
|
||||
|
|
@ -1400,7 +1387,6 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
|
|||
}
|
||||
toml.merge(override_toml, ReplaceOpt::Override);
|
||||
|
||||
config.changelog_seen = toml.changelog_seen;
|
||||
config.change_id = toml.change_id.inner;
|
||||
|
||||
let Build {
|
||||
|
|
|
|||
|
|
@ -630,6 +630,18 @@ pub fn update_existing_submodules(&self) {
|
|||
}
|
||||
}
|
||||
|
||||
/// Updates the given submodule only if it's initialized already; nothing happens otherwise.
|
||||
pub fn update_existing_submodule(&self, submodule: &Path) {
|
||||
// Avoid running git when there isn't a git checkout.
|
||||
if !self.config.submodules(self.rust_info()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if GitInfo::new(false, submodule).is_managed_git_subrepository() {
|
||||
self.update_submodule(submodule);
|
||||
}
|
||||
}
|
||||
|
||||
/// Executes the entire build, as configured by the flags and configuration.
|
||||
pub fn build(&mut self) {
|
||||
unsafe {
|
||||
|
|
|
|||
|
|
@ -170,4 +170,9 @@ pub fn human_readable_changes(changes: &[ChangeInfo]) -> String {
|
|||
severity: ChangeSeverity::Warning,
|
||||
summary: "`rust.split-debuginfo` has been moved to `target.<triple>.split-debuginfo` and its default value is determined for each target individually.",
|
||||
},
|
||||
ChangeInfo {
|
||||
change_id: 123711,
|
||||
severity: ChangeSeverity::Warning,
|
||||
summary: "The deprecated field `changelog-seen` has been removed. Using that field in `config.toml` from now on will result in breakage.",
|
||||
},
|
||||
];
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@
|
|||
- [Profile-guided Optimization](profile-guided-optimization.md)
|
||||
- [Instrumentation-based Code Coverage](instrument-coverage.md)
|
||||
- [Linker-plugin-based LTO](linker-plugin-lto.md)
|
||||
- [Checking conditional configurations](check-cfg.md)
|
||||
- [Exploit Mitigations](exploit-mitigations.md)
|
||||
- [Symbol Mangling](symbol-mangling/index.md)
|
||||
- [v0 Symbol Format](symbol-mangling/v0.md)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
# `check-cfg`
|
||||
|
||||
The tracking issue for this feature is: [#82450](https://github.com/rust-lang/rust/issues/82450).
|
||||
|
||||
------------------------
|
||||
|
||||
This feature enables checking of conditional configuration.
|
||||
# Checking conditional configurations
|
||||
|
||||
`rustc` accepts the `--check-cfg` option, which specifies whether to check conditions and how to
|
||||
check them. The `--check-cfg` option takes a value, called the _check cfg specification_.
|
||||
|
|
@ -18,6 +18,16 @@ The value can either be a single identifier or two identifiers separated by `=`.
|
|||
For examples, `--cfg 'verbose'` or `--cfg 'feature="serde"'`. These correspond
|
||||
to `#[cfg(verbose)]` and `#[cfg(feature = "serde")]` respectively.
|
||||
|
||||
<a id="option-check-cfg"></a>
|
||||
## `--check-cfg`: enables checking conditional configurations
|
||||
|
||||
This flag will enable checking conditional configurations.
|
||||
Refer to the [Checking conditional configurations](check-cfg.md) of this book
|
||||
for further details and explanation.
|
||||
|
||||
For examples, `--check-cfg 'cfg(verbose)'` or `--check-cfg 'cfg(feature, values("serde"))'`.
|
||||
These correspond to `#[cfg(verbose)]` and `#[cfg(feature = "serde")]` respectively.
|
||||
|
||||
<a id="option-l-search-path"></a>
|
||||
## `-L`: add a directory to the library search path
|
||||
|
||||
|
|
|
|||
|
|
@ -131,6 +131,20 @@ This flag accepts the same values as `rustc --cfg`, and uses it to configure
|
|||
compilation. The example above uses `feature`, but any of the `cfg` values
|
||||
are acceptable.
|
||||
|
||||
## `--check-cfg`: check configuration flags
|
||||
|
||||
This flag accepts the same values as `rustc --check-cfg`, and uses it to
|
||||
check configuration flags.
|
||||
|
||||
Using this flag looks like this:
|
||||
|
||||
```bash
|
||||
$ rustdoc src/lib.rs --check-cfg='cfg(my_cfg, values("foo", "bar"))'
|
||||
```
|
||||
|
||||
The example above check every well known names and values (`target_os`, `doc`, `test`, ...)
|
||||
and check the values of `my_cfg`: `foo` and `bar`.
|
||||
|
||||
## `--extern`: specify a dependency's location
|
||||
|
||||
Using this flag looks like this:
|
||||
|
|
|
|||
|
|
@ -618,22 +618,6 @@ crate being documented (`foobar`) and a path to output the calls
|
|||
To scrape examples from test code, e.g. functions marked `#[test]`, then
|
||||
add the `--scrape-tests` flag.
|
||||
|
||||
### `--check-cfg`: check configuration flags
|
||||
|
||||
* Tracking issue: [#82450](https://github.com/rust-lang/rust/issues/82450)
|
||||
|
||||
This flag accepts the same values as `rustc --check-cfg`, and uses it to check configuration flags.
|
||||
|
||||
Using this flag looks like this:
|
||||
|
||||
```bash
|
||||
$ rustdoc src/lib.rs -Z unstable-options \
|
||||
--check-cfg='cfg(feature, values("foo", "bar"))'
|
||||
```
|
||||
|
||||
The example above check every well known names and values (`target_os`, `doc`, `test`, ...)
|
||||
and check the values of `feature`: `foo` and `bar`.
|
||||
|
||||
### `--generate-link-to-definition`: Generate links on types in source code
|
||||
|
||||
* Tracking issue: [#89095](https://github.com/rust-lang/rust/issues/89095)
|
||||
|
|
|
|||
|
|
@ -60,11 +60,8 @@ pub(crate) fn generate_args_file(file_path: &Path, options: &RustdocOptions) ->
|
|||
for cfg in &options.cfgs {
|
||||
content.push(format!("--cfg={cfg}"));
|
||||
}
|
||||
if !options.check_cfgs.is_empty() {
|
||||
content.push("-Zunstable-options".to_string());
|
||||
for check_cfg in &options.check_cfgs {
|
||||
content.push(format!("--check-cfg={check_cfg}"));
|
||||
}
|
||||
for check_cfg in &options.check_cfgs {
|
||||
content.push(format!("--check-cfg={check_cfg}"));
|
||||
}
|
||||
|
||||
for lib_str in &options.lib_strs {
|
||||
|
|
|
|||
|
|
@ -462,6 +462,7 @@ function preLoadCss(cssUrl) {
|
|||
|
||||
case "s":
|
||||
case "S":
|
||||
case "/":
|
||||
ev.preventDefault();
|
||||
searchState.focus();
|
||||
break;
|
||||
|
|
@ -1334,7 +1335,7 @@ function preLoadCss(cssUrl) {
|
|||
|
||||
const shortcuts = [
|
||||
["?", "Show this help dialog"],
|
||||
["S", "Focus the search field"],
|
||||
["S / /", "Focus the search field"],
|
||||
["↑", "Move up in search results"],
|
||||
["↓", "Move down in search results"],
|
||||
["← / →", "Switch result tab (when results focused)"],
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
aria-label="Run search in the documentation" {#+ #}
|
||||
autocomplete="off" {#+ #}
|
||||
spellcheck="false" {#+ #}
|
||||
placeholder="Click or press ‘S’ to search, ‘?’ for more options…" {#+ #}
|
||||
placeholder="Type ‘S’ or ‘/’ to search, ‘?’ for more options…" {#+ #}
|
||||
type="search"> {# #}
|
||||
<div id="help-button" tabindex="-1"> {# #}
|
||||
<a href="{{page.root_path|safe}}help.html" title="help">?</a> {# #}
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ fn opts() -> Vec<RustcOptGroup> {
|
|||
o.optmulti("L", "library-path", "directory to add to crate search path", "DIR")
|
||||
}),
|
||||
stable("cfg", |o| o.optmulti("", "cfg", "pass a --cfg to rustc", "")),
|
||||
unstable("check-cfg", |o| o.optmulti("", "check-cfg", "pass a --check-cfg to rustc", "")),
|
||||
stable("check-cfg", |o| o.optmulti("", "check-cfg", "pass a --check-cfg to rustc", "")),
|
||||
stable("extern", |o| o.optmulti("", "extern", "pass an --extern to rustc", "NAME[=PATH]")),
|
||||
unstable("extern-html-root-url", |o| {
|
||||
o.optmulti(
|
||||
|
|
|
|||
|
|
@ -451,36 +451,32 @@ Some native rustc `-Z` flags are also very relevant for Miri:
|
|||
* `-Zmir-emit-retag` controls whether `Retag` statements are emitted. Miri
|
||||
enables this per default because it is needed for [Stacked Borrows] and [Tree Borrows].
|
||||
|
||||
Moreover, Miri recognizes some environment variables:
|
||||
Moreover, Miri recognizes some environment variables (unless noted otherwise, these are supported
|
||||
by all intended entry points, i.e. `cargo miri` and `./miri {test,run}`):
|
||||
|
||||
* `MIRI_AUTO_OPS` indicates whether the automatic execution of rustfmt, clippy and toolchain setup
|
||||
should be skipped. If it is set to `no`, they are skipped. This is used to allow automated IDE
|
||||
actions to avoid the auto ops.
|
||||
* `MIRI_LOG`, `MIRI_BACKTRACE` control logging and backtrace printing during
|
||||
Miri executions, also [see "Testing the Miri driver" in `CONTRIBUTING.md`][testing-miri].
|
||||
* `MIRIFLAGS` (recognized by `cargo miri` and the test suite) defines extra
|
||||
flags to be passed to Miri.
|
||||
* `MIRI_LIB_SRC` defines the directory where Miri expects the sources of the
|
||||
standard library that it will build and use for interpretation. This directory
|
||||
must point to the `library` subdirectory of a `rust-lang/rust` repository
|
||||
checkout.
|
||||
* `MIRI_SYSROOT` (recognized by `cargo miri` and the Miri driver) indicates the sysroot to use. When
|
||||
using `cargo miri`, this skips the automatic setup -- only set this if you do not want to use the
|
||||
automatically created sysroot. For directly invoking the Miri driver, this variable (or a
|
||||
`--sysroot` flag) is mandatory. When invoking `cargo miri setup`, this indicates where the sysroot
|
||||
will be put.
|
||||
* `MIRI_TEST_TARGET` (recognized by the test suite and the `./miri` script) indicates which target
|
||||
* `MIRIFLAGS` defines extra flags to be passed to Miri.
|
||||
* `MIRI_LIB_SRC` defines the directory where Miri expects the sources of the standard library that
|
||||
it will build and use for interpretation. This directory must point to the `library` subdirectory
|
||||
of a `rust-lang/rust` repository checkout.
|
||||
* `MIRI_SYSROOT` indicates the sysroot to use. When using `cargo miri`, this skips the automatic
|
||||
setup -- only set this if you do not want to use the automatically created sysroot. When invoking
|
||||
`cargo miri setup`, this indicates where the sysroot will be put.
|
||||
* `MIRI_TEST_TARGET` (recognized by `./miri {test,run}`) indicates which target
|
||||
architecture to test against. `miri` and `cargo miri` accept the `--target` flag for the same
|
||||
purpose.
|
||||
* `MIRI_TEST_THREADS` (recognized by the test suite): set the number of threads to use for running tests.
|
||||
By default the number of cores is used.
|
||||
* `MIRI_NO_STD` (recognized by `cargo miri`) makes sure that the target's sysroot is built without
|
||||
libstd. This allows testing and running no_std programs.
|
||||
(Miri has a heuristic to detect no-std targets based on the target name; this environment variable
|
||||
is only needed when that heuristic fails.)
|
||||
* `RUSTC_BLESS` (recognized by the test suite and `cargo-miri-test/run-test.py`): overwrite all
|
||||
* `MIRI_TEST_THREADS` (recognized by `./miri test`): set the number of threads to use for running tests.
|
||||
By default, the number of cores is used.
|
||||
* `MIRI_NO_STD` makes sure that the target's sysroot is built without libstd. This allows testing
|
||||
and running no_std programs. (Miri has a heuristic to detect no-std targets based on the target
|
||||
name; this environment variable is only needed when that heuristic fails.)
|
||||
* `RUSTC_BLESS` (recognized by `./miri test` and `cargo-miri-test/run-test.py`): overwrite all
|
||||
`stderr` and `stdout` files instead of checking whether the output matches.
|
||||
* `MIRI_SKIP_UI_CHECKS` (recognized by the test suite): don't check whether the
|
||||
* `MIRI_SKIP_UI_CHECKS` (recognized by `./miri test`): don't check whether the
|
||||
`stderr` or `stdout` files match the actual output.
|
||||
|
||||
The following environment variables are *internal* and must not be used by
|
||||
|
|
|
|||
|
|
@ -194,9 +194,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustc-build-sysroot"
|
||||
version = "0.4.5"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a26170e1d79ea32f7ccec3188dd13cfc1f18c82764a9cbc1071667c0f865a4ea"
|
||||
checksum = "a9bf37423495cd3a6a9ef8c75fc4566de0d26de0ab75f36f67a426e58df5768c"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"rustc_version",
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ directories = "5"
|
|||
rustc_version = "0.4"
|
||||
serde_json = "1.0.40"
|
||||
cargo_metadata = "0.18.0"
|
||||
rustc-build-sysroot = "0.4.1"
|
||||
rustc-build-sysroot = "0.4.6"
|
||||
|
||||
# Enable some feature flags that dev-dependencies need but dependencies
|
||||
# do not. This makes `./miri install` after `./miri build` faster.
|
||||
|
|
|
|||
|
|
@ -172,8 +172,6 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
|
|||
// Forward all further arguments (not consumed by `ArgSplitFlagValue`) to cargo.
|
||||
cmd.args(args);
|
||||
|
||||
// Let it know where the Miri sysroot lives.
|
||||
cmd.env("MIRI_SYSROOT", miri_sysroot);
|
||||
// Set `RUSTC_WRAPPER` to ourselves. Cargo will prepend that binary to its usual invocation,
|
||||
// i.e., the first argument is `rustc` -- which is what we use in `main` to distinguish
|
||||
// the two codepaths. (That extra argument is why we prefer this over setting `RUSTC`.)
|
||||
|
|
@ -200,10 +198,7 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
|
|||
// always applied. However, buggy build scripts (https://github.com/eyre-rs/eyre/issues/84) and
|
||||
// also cargo (https://github.com/rust-lang/cargo/issues/10885) will invoke `rustc` even when
|
||||
// `RUSTC_WRAPPER` is set, bypassing the wrapper. To make sure everything is coherent, we want
|
||||
// that to be the Miri driver, but acting as rustc, on the target level. (Target, rather than
|
||||
// host, is needed for cross-interpretation situations.) This is not a perfect emulation of real
|
||||
// rustc (it might be unable to produce binaries since the sysroot is check-only), but it's as
|
||||
// close as we can get, and it's good enough for autocfg.
|
||||
// that to be the Miri driver, but acting as rustc, in host mode.
|
||||
//
|
||||
// In `main`, we need the value of `RUSTC` to distinguish RUSTC_WRAPPER invocations from rustdoc
|
||||
// or TARGET_RUNNER invocations, so we canonicalize it here to make it exceedingly unlikely that
|
||||
|
|
@ -212,7 +207,10 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
|
|||
// bootstrap `rustc` thing in our way! Instead, we have MIRI_HOST_SYSROOT to use for host
|
||||
// builds.
|
||||
cmd.env("RUSTC", fs::canonicalize(find_miri()).unwrap());
|
||||
cmd.env("MIRI_BE_RUSTC", "target"); // we better remember to *unset* this in the other phases!
|
||||
// In case we get invoked as RUSTC without the wrapper, let's be a host rustc. This makes no
|
||||
// sense for cross-interpretation situations, but without the wrapper, this will use the host
|
||||
// sysroot, so asking it to behave like a target build makes even less sense.
|
||||
cmd.env("MIRI_BE_RUSTC", "host"); // we better remember to *unset* this in the other phases!
|
||||
|
||||
// Set rustdoc to us as well, so we can run doctests.
|
||||
if let Some(orig_rustdoc) = env::var_os("RUSTDOC") {
|
||||
|
|
@ -220,6 +218,8 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
|
|||
}
|
||||
cmd.env("RUSTDOC", &cargo_miri_path);
|
||||
|
||||
// Forward some crucial information to our own re-invocations.
|
||||
cmd.env("MIRI_SYSROOT", miri_sysroot);
|
||||
cmd.env("MIRI_LOCAL_CRATES", local_crates(&metadata));
|
||||
if verbose > 0 {
|
||||
cmd.env("MIRI_VERBOSE", verbose.to_string()); // This makes the other phases verbose.
|
||||
|
|
@ -412,6 +412,12 @@ fn out_filenames() -> Vec<PathBuf> {
|
|||
// Arguments are treated very differently depending on whether this crate is
|
||||
// for interpretation by Miri, or for use by a build script / proc macro.
|
||||
if target_crate {
|
||||
if phase != RustcPhase::Setup {
|
||||
// Set the sysroot -- except during setup, where we don't have an existing sysroot yet
|
||||
// and where the bootstrap wrapper adds its own `--sysroot` flag so we can't set ours.
|
||||
cmd.arg("--sysroot").arg(env::var_os("MIRI_SYSROOT").unwrap());
|
||||
}
|
||||
|
||||
// Forward arguments, but patched.
|
||||
let emit_flag = "--emit";
|
||||
// This hack helps bootstrap run standard library tests in Miri. The issue is as follows:
|
||||
|
|
@ -574,6 +580,12 @@ pub fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: Runner
|
|||
cmd.env(name, val);
|
||||
}
|
||||
|
||||
if phase != RunnerPhase::Rustdoc {
|
||||
// Set the sysroot. Not necessary in rustdoc, where we already set the sysroot in
|
||||
// `phase_rustdoc`. rustdoc will forward that flag when invoking rustc (i.e., us), so the
|
||||
// flag is present in `info.args`.
|
||||
cmd.arg("--sysroot").arg(env::var_os("MIRI_SYSROOT").unwrap());
|
||||
}
|
||||
// Forward rustc arguments.
|
||||
// We need to patch "--extern" filenames because we forced a check-only
|
||||
// build without cargo knowing about that: replace `.rlib` suffix by
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
use std::ffi::OsString;
|
||||
use std::io::Write;
|
||||
use std::ops::Not;
|
||||
use std::path::PathBuf;
|
||||
use std::process;
|
||||
use std::thread;
|
||||
use std::time;
|
||||
|
|
@ -20,10 +21,11 @@
|
|||
const JOSH_PORT: &str = "42042";
|
||||
|
||||
impl MiriEnv {
|
||||
fn build_miri_sysroot(&mut self, quiet: bool) -> Result<()> {
|
||||
if self.sh.var("MIRI_SYSROOT").is_ok() {
|
||||
/// Returns the location of the sysroot.
|
||||
fn build_miri_sysroot(&mut self, quiet: bool) -> Result<PathBuf> {
|
||||
if let Some(miri_sysroot) = self.sh.var_os("MIRI_SYSROOT") {
|
||||
// Sysroot already set, use that.
|
||||
return Ok(());
|
||||
return Ok(miri_sysroot.into());
|
||||
}
|
||||
let manifest_path = path!(self.miri_dir / "cargo-miri" / "Cargo.toml");
|
||||
let Self { toolchain, cargo_extra_flags, .. } = &self;
|
||||
|
|
@ -57,8 +59,8 @@ fn build_miri_sysroot(&mut self, quiet: bool) -> Result<()> {
|
|||
.with_context(|| "`cargo miri setup` failed")?;
|
||||
panic!("`cargo miri setup` didn't fail again the 2nd time?");
|
||||
};
|
||||
self.sh.set_var("MIRI_SYSROOT", output);
|
||||
Ok(())
|
||||
self.sh.set_var("MIRI_SYSROOT", &output);
|
||||
Ok(output.into())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -505,8 +507,10 @@ fn run(dep: bool, mut flags: Vec<OsString>) -> Result<()> {
|
|||
flags.push("--edition=2021".into()); // keep in sync with `tests/ui.rs`.`
|
||||
}
|
||||
|
||||
// Prepare a sysroot.
|
||||
e.build_miri_sysroot(/* quiet */ true)?;
|
||||
// Prepare a sysroot, and add it to the flags.
|
||||
let miri_sysroot = e.build_miri_sysroot(/* quiet */ true)?;
|
||||
flags.push("--sysroot".into());
|
||||
flags.push(miri_sysroot.into());
|
||||
|
||||
// Then run the actual command. Also add MIRIFLAGS.
|
||||
let miri_manifest = path!(e.miri_dir / "Cargo.toml");
|
||||
|
|
|
|||
|
|
@ -282,25 +282,6 @@ fn run_compiler(
|
|||
callbacks: &mut (dyn rustc_driver::Callbacks + Send),
|
||||
using_internal_features: std::sync::Arc<std::sync::atomic::AtomicBool>,
|
||||
) -> ! {
|
||||
if target_crate {
|
||||
// Miri needs a custom sysroot for target crates.
|
||||
// If no `--sysroot` is given, the `MIRI_SYSROOT` env var is consulted to find where
|
||||
// that sysroot lives, and that is passed to rustc.
|
||||
let sysroot_flag = "--sysroot";
|
||||
if !args.iter().any(|e| e.starts_with(sysroot_flag)) {
|
||||
// Using the built-in default here would be plain wrong, so we *require*
|
||||
// the env var to make sure things make sense.
|
||||
let miri_sysroot = env::var("MIRI_SYSROOT").unwrap_or_else(|_| {
|
||||
show_error!(
|
||||
"Miri was invoked in 'target' mode without `MIRI_SYSROOT` or `--sysroot` being set"
|
||||
)
|
||||
});
|
||||
|
||||
args.push(sysroot_flag.to_owned());
|
||||
args.push(miri_sysroot);
|
||||
}
|
||||
}
|
||||
|
||||
// Don't insert `MIRI_DEFAULT_ARGS`, in particular, `--cfg=miri`, if we are building
|
||||
// a "host" crate. That may cause procedural macros (and probably build scripts) to
|
||||
// depend on Miri-only symbols, such as `miri_resolve_frame`:
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ pub fn new_allocation(
|
|||
&mut self,
|
||||
id: AllocId,
|
||||
alloc_size: Size,
|
||||
kind: MemoryKind<machine::MiriMemoryKind>,
|
||||
kind: MemoryKind,
|
||||
machine: &MiriMachine<'_, '_>,
|
||||
) -> AllocState {
|
||||
match self.borrow_tracker_method {
|
||||
|
|
|
|||
|
|
@ -509,7 +509,7 @@ pub fn new_allocation(
|
|||
id: AllocId,
|
||||
size: Size,
|
||||
state: &mut GlobalStateInner,
|
||||
kind: MemoryKind<MiriMemoryKind>,
|
||||
kind: MemoryKind,
|
||||
machine: &MiriMachine<'_, '_>,
|
||||
) -> Self {
|
||||
let (base_tag, perm) = match kind {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ pub fn new_allocation(
|
|||
id: AllocId,
|
||||
size: Size,
|
||||
state: &mut GlobalStateInner,
|
||||
_kind: MemoryKind<machine::MiriMemoryKind>,
|
||||
_kind: MemoryKind,
|
||||
machine: &MiriMachine<'_, 'tcx>,
|
||||
) -> Self {
|
||||
let tag = state.base_ptr_tag(id, machine); // Fresh tag for the root
|
||||
|
|
|
|||
|
|
@ -844,7 +844,7 @@ pub fn new_allocation(
|
|||
global: &GlobalState,
|
||||
thread_mgr: &ThreadManager<'_, '_>,
|
||||
len: Size,
|
||||
kind: MemoryKind<MiriMemoryKind>,
|
||||
kind: MemoryKind,
|
||||
current_span: Span,
|
||||
) -> VClockAlloc {
|
||||
let (alloc_timestamp, alloc_index) = match kind {
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ pub enum NonHaltingDiagnostic {
|
|||
/// This `Item` was popped from the borrow stack. The string explains the reason.
|
||||
PoppedPointerTag(Item, String),
|
||||
CreatedCallId(CallId),
|
||||
CreatedAlloc(AllocId, Size, Align, MemoryKind<MiriMemoryKind>),
|
||||
CreatedAlloc(AllocId, Size, Align, MemoryKind),
|
||||
FreedAlloc(AllocId),
|
||||
AccessedAlloc(AllocId, AccessKind),
|
||||
RejectedIsolatedOp(String),
|
||||
|
|
@ -414,7 +414,7 @@ pub fn report_error<'tcx, 'mir>(
|
|||
|
||||
pub fn report_leaks<'mir, 'tcx>(
|
||||
ecx: &InterpCx<'mir, 'tcx, MiriMachine<'mir, 'tcx>>,
|
||||
leaks: Vec<(AllocId, MemoryKind<MiriMemoryKind>, Allocation<Provenance, AllocExtra<'tcx>>)>,
|
||||
leaks: Vec<(AllocId, MemoryKind, Allocation<Provenance, AllocExtra<'tcx>>)>,
|
||||
) {
|
||||
let mut any_pruned = false;
|
||||
for (id, kind, mut alloc) in leaks {
|
||||
|
|
|
|||
|
|
@ -83,6 +83,17 @@ pub enum AccessKind {
|
|||
("EAGAIN", WouldBlock),
|
||||
]
|
||||
};
|
||||
// This mapping should match `decode_error_kind` in
|
||||
// <https://github.com/rust-lang/rust/blob/master/library/std/src/sys/pal/windows/mod.rs>.
|
||||
const WINDOWS_IO_ERROR_TABLE: &[(&str, std::io::ErrorKind)] = {
|
||||
use std::io::ErrorKind::*;
|
||||
// FIXME: this is still incomplete.
|
||||
&[
|
||||
("ERROR_ACCESS_DENIED", PermissionDenied),
|
||||
("ERROR_FILE_NOT_FOUND", NotFound),
|
||||
("ERROR_INVALID_PARAMETER", InvalidInput),
|
||||
]
|
||||
};
|
||||
|
||||
/// Gets an instance for a path.
|
||||
///
|
||||
|
|
@ -749,20 +760,12 @@ fn io_error_to_errnum(
|
|||
}
|
||||
throw_unsup_format!("io error {:?} cannot be translated into a raw os error", err_kind)
|
||||
} else if target.families.iter().any(|f| f == "windows") {
|
||||
// FIXME: we have to finish implementing the Windows equivalent of this.
|
||||
use std::io::ErrorKind::*;
|
||||
Ok(this.eval_windows(
|
||||
"c",
|
||||
match err_kind {
|
||||
NotFound => "ERROR_FILE_NOT_FOUND",
|
||||
PermissionDenied => "ERROR_ACCESS_DENIED",
|
||||
_ =>
|
||||
throw_unsup_format!(
|
||||
"io error {:?} cannot be translated into a raw os error",
|
||||
err_kind
|
||||
),
|
||||
},
|
||||
))
|
||||
for &(name, kind) in WINDOWS_IO_ERROR_TABLE {
|
||||
if err_kind == kind {
|
||||
return Ok(this.eval_windows("c", name));
|
||||
}
|
||||
}
|
||||
throw_unsup_format!("io error {:?} cannot be translated into a raw os error", err_kind);
|
||||
} else {
|
||||
throw_unsup_format!(
|
||||
"converting io::Error into errnum is unsupported for OS {}",
|
||||
|
|
@ -786,8 +789,14 @@ fn try_errnum_to_io_error(
|
|||
return Ok(Some(kind));
|
||||
}
|
||||
}
|
||||
// Our table is as complete as the mapping in std, so we are okay with saying "that's a
|
||||
// strange one" here.
|
||||
return Ok(None);
|
||||
} else if target.families.iter().any(|f| f == "windows") {
|
||||
let errnum = errnum.to_u32()?;
|
||||
for &(name, kind) in WINDOWS_IO_ERROR_TABLE {
|
||||
if errnum == this.eval_windows("c", name).to_u32()? {
|
||||
return Ok(Some(kind));
|
||||
}
|
||||
}
|
||||
return Ok(None);
|
||||
} else {
|
||||
throw_unsup_format!(
|
||||
|
|
@ -1344,3 +1353,18 @@ pub(crate) fn simd_element_to_bool(elem: ImmTy<'_, Provenance>) -> InterpResult<
|
|||
_ => throw_ub_format!("each element of a SIMD mask must be all-0-bits or all-1-bits"),
|
||||
})
|
||||
}
|
||||
|
||||
/// Check whether an operation that writes to a target buffer was successful.
|
||||
/// Accordingly select return value.
|
||||
/// Local helper function to be used in Windows shims.
|
||||
pub(crate) fn windows_check_buffer_size((success, len): (bool, u64)) -> u32 {
|
||||
if success {
|
||||
// If the function succeeds, the return value is the number of characters stored in the target buffer,
|
||||
// not including the terminating null character.
|
||||
u32::try_from(len.checked_sub(1).unwrap()).unwrap()
|
||||
} else {
|
||||
// If the target buffer was not large enough to hold the data, the return value is the buffer size, in characters,
|
||||
// required to hold the string and its terminating null character.
|
||||
u32::try_from(len).unwrap()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#![feature(let_chains)]
|
||||
#![feature(lint_reasons)]
|
||||
#![feature(trait_upcasting)]
|
||||
#![feature(absolute_path)]
|
||||
// Configure clippy and other lints
|
||||
#![allow(
|
||||
clippy::collapsible_else_if,
|
||||
|
|
@ -125,7 +126,7 @@
|
|||
};
|
||||
pub use crate::helpers::{AccessKind, EvalContextExt as _};
|
||||
pub use crate::machine::{
|
||||
AllocExtra, FrameExtra, MiriInterpCx, MiriInterpCxExt, MiriMachine, MiriMemoryKind,
|
||||
AllocExtra, FrameExtra, MemoryKind, MiriInterpCx, MiriInterpCxExt, MiriMachine, MiriMemoryKind,
|
||||
PrimitiveLayouts, Provenance, ProvenanceExtra,
|
||||
};
|
||||
pub use crate::mono_hash_map::MonoHashMap;
|
||||
|
|
|
|||
|
|
@ -135,9 +135,9 @@ pub enum MiriMemoryKind {
|
|||
Mmap,
|
||||
}
|
||||
|
||||
impl From<MiriMemoryKind> for MemoryKind<MiriMemoryKind> {
|
||||
impl From<MiriMemoryKind> for MemoryKind {
|
||||
#[inline(always)]
|
||||
fn from(kind: MiriMemoryKind) -> MemoryKind<MiriMemoryKind> {
|
||||
fn from(kind: MiriMemoryKind) -> MemoryKind {
|
||||
MemoryKind::Machine(kind)
|
||||
}
|
||||
}
|
||||
|
|
@ -185,6 +185,8 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|||
}
|
||||
}
|
||||
|
||||
pub type MemoryKind = interpret::MemoryKind<MiriMemoryKind>;
|
||||
|
||||
/// Pointer provenance.
|
||||
#[derive(Clone, Copy)]
|
||||
pub enum Provenance {
|
||||
|
|
@ -863,10 +865,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
|
|||
type ProvenanceExtra = ProvenanceExtra;
|
||||
type Bytes = Box<[u8]>;
|
||||
|
||||
type MemoryMap = MonoHashMap<
|
||||
AllocId,
|
||||
(MemoryKind<MiriMemoryKind>, Allocation<Provenance, Self::AllocExtra, Self::Bytes>),
|
||||
>;
|
||||
type MemoryMap =
|
||||
MonoHashMap<AllocId, (MemoryKind, Allocation<Provenance, Self::AllocExtra, Self::Bytes>)>;
|
||||
|
||||
const GLOBAL_KIND: Option<MiriMemoryKind> = Some(MiriMemoryKind::Global);
|
||||
|
||||
|
|
@ -1088,7 +1088,7 @@ fn adjust_allocation<'b>(
|
|||
ecx: &MiriInterpCx<'mir, 'tcx>,
|
||||
id: AllocId,
|
||||
alloc: Cow<'b, Allocation>,
|
||||
kind: Option<MemoryKind<Self::MemoryKind>>,
|
||||
kind: Option<MemoryKind>,
|
||||
) -> InterpResult<'tcx, Cow<'b, Allocation<Self::Provenance, Self::AllocExtra>>> {
|
||||
let kind = kind.expect("we set our STATIC_KIND so this cannot be None");
|
||||
if ecx.machine.tracked_alloc_ids.contains(&id) {
|
||||
|
|
@ -1280,6 +1280,7 @@ fn before_memory_deallocation(
|
|||
(alloc_id, prove_extra): (AllocId, Self::ProvenanceExtra),
|
||||
size: Size,
|
||||
align: Align,
|
||||
_kind: MemoryKind,
|
||||
) -> InterpResult<'tcx> {
|
||||
if machine.tracked_alloc_ids.contains(&alloc_id) {
|
||||
machine.emit_diagnostic(NonHaltingDiagnostic::FreedAlloc(alloc_id));
|
||||
|
|
|
|||
|
|
@ -9,21 +9,7 @@
|
|||
use rustc_target::abi::Size;
|
||||
|
||||
use crate::*;
|
||||
|
||||
/// Check whether an operation that writes to a target buffer was successful.
|
||||
/// Accordingly select return value.
|
||||
/// Local helper function to be used in Windows shims.
|
||||
fn windows_check_buffer_size((success, len): (bool, u64)) -> u32 {
|
||||
if success {
|
||||
// If the function succeeds, the return value is the number of characters stored in the target buffer,
|
||||
// not including the terminating null character.
|
||||
u32::try_from(len.checked_sub(1).unwrap()).unwrap()
|
||||
} else {
|
||||
// If the target buffer was not large enough to hold the data, the return value is the buffer size, in characters,
|
||||
// required to hold the string and its terminating null character.
|
||||
u32::try_from(len).unwrap()
|
||||
}
|
||||
}
|
||||
use helpers::windows_check_buffer_size;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct EnvVars<'tcx> {
|
||||
|
|
@ -164,7 +150,8 @@ fn GetEnvironmentVariableW(
|
|||
let name_ptr = this.read_pointer(name_op)?;
|
||||
let name = this.read_os_str_from_wide_str(name_ptr)?;
|
||||
Ok(match this.machine.env_vars.map.get(&name) {
|
||||
Some(var_ptr) => {
|
||||
Some(&var_ptr) => {
|
||||
this.set_last_error(Scalar::from_u32(0))?; // make sure this is unambiguously not an error
|
||||
// The offset is used to strip the "{name}=" part of the string.
|
||||
#[rustfmt::skip]
|
||||
let name_offset_bytes = u64::try_from(name.len()).unwrap()
|
||||
|
|
@ -375,10 +362,12 @@ fn GetCurrentDirectoryW(
|
|||
|
||||
// If we cannot get the current directory, we return 0
|
||||
match env::current_dir() {
|
||||
Ok(cwd) =>
|
||||
Ok(cwd) => {
|
||||
this.set_last_error(Scalar::from_u32(0))?; // make sure this is unambiguously not an error
|
||||
return Ok(Scalar::from_u32(windows_check_buffer_size(
|
||||
this.write_path_to_wide_str(&cwd, buf, size, /*truncate*/ false)?,
|
||||
))),
|
||||
)));
|
||||
}
|
||||
Err(e) => this.set_last_error_from_io_error(e.kind())?,
|
||||
}
|
||||
Ok(Scalar::from_u32(0))
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ fn write_os_str_to_c_str(
|
|||
///
|
||||
/// If `truncate == true`, then in case `size` is not large enough it *will* write the first
|
||||
/// `size.saturating_sub(1)` many items, followed by a null terminator (if `size > 0`).
|
||||
/// The return value is still `(false, length)` in that case.
|
||||
fn write_os_str_to_wide_str(
|
||||
&mut self,
|
||||
os_str: &OsStr,
|
||||
|
|
@ -136,7 +137,7 @@ fn os_str_to_u16vec<'tcx>(os_str: &OsStr) -> InterpResult<'tcx, Vec<u16>> {
|
|||
fn alloc_os_str_as_c_str(
|
||||
&mut self,
|
||||
os_str: &OsStr,
|
||||
memkind: MemoryKind<MiriMemoryKind>,
|
||||
memkind: MemoryKind,
|
||||
) -> InterpResult<'tcx, Pointer<Option<Provenance>>> {
|
||||
let size = u64::try_from(os_str.len()).unwrap().checked_add(1).unwrap(); // Make space for `0` terminator.
|
||||
let this = self.eval_context_mut();
|
||||
|
|
@ -152,7 +153,7 @@ fn alloc_os_str_as_c_str(
|
|||
fn alloc_os_str_as_wide_str(
|
||||
&mut self,
|
||||
os_str: &OsStr,
|
||||
memkind: MemoryKind<MiriMemoryKind>,
|
||||
memkind: MemoryKind,
|
||||
) -> InterpResult<'tcx, Pointer<Option<Provenance>>> {
|
||||
let size = u64::try_from(os_str.len()).unwrap().checked_add(1).unwrap(); // Make space for `0x0000` terminator.
|
||||
let this = self.eval_context_mut();
|
||||
|
|
@ -229,7 +230,7 @@ fn write_path_to_wide_str(
|
|||
fn alloc_path_as_c_str(
|
||||
&mut self,
|
||||
path: &Path,
|
||||
memkind: MemoryKind<MiriMemoryKind>,
|
||||
memkind: MemoryKind,
|
||||
) -> InterpResult<'tcx, Pointer<Option<Provenance>>> {
|
||||
let this = self.eval_context_mut();
|
||||
let os_str =
|
||||
|
|
@ -242,7 +243,7 @@ fn alloc_path_as_c_str(
|
|||
fn alloc_path_as_wide_str(
|
||||
&mut self,
|
||||
path: &Path,
|
||||
memkind: MemoryKind<MiriMemoryKind>,
|
||||
memkind: MemoryKind,
|
||||
) -> InterpResult<'tcx, Pointer<Option<Provenance>>> {
|
||||
let this = self.eval_context_mut();
|
||||
let os_str =
|
||||
|
|
@ -315,9 +316,21 @@ fn convert_path<'a>(
|
|||
// We also have to ensure that absolute paths remain absolute.
|
||||
match direction {
|
||||
PathConversion::HostToTarget => {
|
||||
// If this start withs a `\`, we add `\\?` so it starts with `\\?\` which is
|
||||
// some magic path on Windows that *is* considered absolute.
|
||||
if converted.get(0).copied() == Some(b'\\') {
|
||||
// If the path is `/C:/`, the leading backslash was probably added by the below
|
||||
// driver letter handling and we should get rid of it again.
|
||||
if converted.get(0).copied() == Some(b'\\')
|
||||
&& converted.get(2).copied() == Some(b':')
|
||||
&& converted.get(3).copied() == Some(b'\\')
|
||||
{
|
||||
converted.remove(0);
|
||||
}
|
||||
// If this start withs a `\` but not a `\\`, then for Windows this is a relative
|
||||
// path. But the host path is absolute as it started with `/`. We add `\\?` so
|
||||
// it starts with `\\?\` which is some magic path on Windows that *is*
|
||||
// considered absolute.
|
||||
else if converted.get(0).copied() == Some(b'\\')
|
||||
&& converted.get(1).copied() != Some(b'\\')
|
||||
{
|
||||
converted.splice(0..0, b"\\\\?".iter().copied());
|
||||
}
|
||||
}
|
||||
|
|
@ -332,6 +345,12 @@ fn convert_path<'a>(
|
|||
// Remove first 3 characters
|
||||
converted.splice(0..3, std::iter::empty());
|
||||
}
|
||||
// If it starts with a drive letter, convert it to an absolute Unix path.
|
||||
else if converted.get(1).copied() == Some(b':')
|
||||
&& converted.get(2).copied() == Some(b'/')
|
||||
{
|
||||
converted.insert(0, b'/');
|
||||
}
|
||||
}
|
||||
}
|
||||
Cow::Owned(OsString::from_vec(converted))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
use std::ffi::OsStr;
|
||||
use std::io;
|
||||
use std::iter;
|
||||
use std::path::{self, Path, PathBuf};
|
||||
use std::str;
|
||||
|
||||
use rustc_span::Symbol;
|
||||
|
|
@ -20,6 +23,61 @@ fn is_dyn_sym(name: &str) -> bool {
|
|||
)
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn win_absolute<'tcx>(path: &Path) -> InterpResult<'tcx, io::Result<PathBuf>> {
|
||||
// We are on Windows so we can simply lte the host do this.
|
||||
return Ok(path::absolute(path));
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[allow(clippy::get_first, clippy::arithmetic_side_effects)]
|
||||
fn win_absolute<'tcx>(path: &Path) -> InterpResult<'tcx, io::Result<PathBuf>> {
|
||||
// We are on Unix, so we need to implement parts of the logic ourselves.
|
||||
let bytes = path.as_os_str().as_encoded_bytes();
|
||||
// If it starts with `//` (these were backslashes but are already converted)
|
||||
// then this is a magic special path, we just leave it unchanged.
|
||||
if bytes.get(0).copied() == Some(b'/') && bytes.get(1).copied() == Some(b'/') {
|
||||
return Ok(Ok(path.into()));
|
||||
};
|
||||
// Special treatment for Windows' magic filenames: they are treated as being relative to `\\.\`.
|
||||
let magic_filenames = &[
|
||||
"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8",
|
||||
"COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
|
||||
];
|
||||
if magic_filenames.iter().any(|m| m.as_bytes() == bytes) {
|
||||
let mut result: Vec<u8> = br"//./".into();
|
||||
result.extend(bytes);
|
||||
return Ok(Ok(bytes_to_os_str(&result)?.into()));
|
||||
}
|
||||
// Otherwise we try to do something kind of close to what Windows does, but this is probably not
|
||||
// right in all cases. We iterate over the components between `/`, and remove trailing `.`,
|
||||
// except that trailing `..` remain unchanged.
|
||||
let mut result = vec![];
|
||||
let mut bytes = bytes; // the remaining bytes to process
|
||||
loop {
|
||||
let len = bytes.iter().position(|&b| b == b'/').unwrap_or(bytes.len());
|
||||
let mut component = &bytes[..len];
|
||||
if len >= 2 && component[len - 1] == b'.' && component[len - 2] != b'.' {
|
||||
// Strip trailing `.`
|
||||
component = &component[..len - 1];
|
||||
}
|
||||
// Add this component to output.
|
||||
result.extend(component);
|
||||
// Prepare next iteration.
|
||||
if len < bytes.len() {
|
||||
// There's a component after this; add `/` and process remaining bytes.
|
||||
result.push(b'/');
|
||||
bytes = &bytes[len + 1..];
|
||||
continue;
|
||||
} else {
|
||||
// This was the last component and it did not have a trailing `/`.
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Let the host `absolute` function do working-dir handling
|
||||
Ok(path::absolute(bytes_to_os_str(&result)?))
|
||||
}
|
||||
|
||||
impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriInterpCx<'mir, 'tcx> {}
|
||||
pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
|
||||
fn emulate_foreign_item_inner(
|
||||
|
|
@ -111,7 +169,7 @@ fn emulate_foreign_item_inner(
|
|||
|
||||
let written = if handle == -11 || handle == -12 {
|
||||
// stdout/stderr
|
||||
use std::io::{self, Write};
|
||||
use io::Write;
|
||||
|
||||
let buf_cont =
|
||||
this.read_bytes_ptr_strip_provenance(buf, Size::from_bytes(u64::from(n)))?;
|
||||
|
|
@ -145,6 +203,40 @@ fn emulate_foreign_item_inner(
|
|||
dest,
|
||||
)?;
|
||||
}
|
||||
"GetFullPathNameW" => {
|
||||
let [filename, size, buffer, filepart] =
|
||||
this.check_shim(abi, Abi::System { unwind: false }, link_name, args)?;
|
||||
this.check_no_isolation("`GetFullPathNameW`")?;
|
||||
|
||||
let filename = this.read_pointer(filename)?;
|
||||
let size = this.read_scalar(size)?.to_u32()?;
|
||||
let buffer = this.read_pointer(buffer)?;
|
||||
let filepart = this.read_pointer(filepart)?;
|
||||
|
||||
if !this.ptr_is_null(filepart)? {
|
||||
throw_unsup_format!("GetFullPathNameW: non-null `lpFilePart` is not supported");
|
||||
}
|
||||
|
||||
let filename = this.read_path_from_wide_str(filename)?;
|
||||
let result = match win_absolute(&filename)? {
|
||||
Err(err) => {
|
||||
this.set_last_error_from_io_error(err.kind())?;
|
||||
Scalar::from_u32(0) // return zero upon failure
|
||||
}
|
||||
Ok(abs_filename) => {
|
||||
this.set_last_error(Scalar::from_u32(0))?; // make sure this is unambiguously not an error
|
||||
Scalar::from_u32(helpers::windows_check_buffer_size(
|
||||
this.write_path_to_wide_str(
|
||||
&abs_filename,
|
||||
buffer,
|
||||
size.into(),
|
||||
/*truncate*/ false,
|
||||
)?,
|
||||
))
|
||||
}
|
||||
};
|
||||
this.write_scalar(result, dest)?;
|
||||
}
|
||||
|
||||
// Allocation
|
||||
"HeapAlloc" => {
|
||||
|
|
@ -533,6 +625,43 @@ fn emulate_foreign_item_inner(
|
|||
this.set_last_error(insufficient_buffer)?;
|
||||
}
|
||||
}
|
||||
"FormatMessageW" => {
|
||||
let [flags, module, message_id, language_id, buffer, size, arguments] =
|
||||
this.check_shim(abi, Abi::System { unwind: false }, link_name, args)?;
|
||||
|
||||
let flags = this.read_scalar(flags)?.to_u32()?;
|
||||
let _module = this.read_pointer(module)?; // seems to contain a module name
|
||||
let message_id = this.read_scalar(message_id)?;
|
||||
let _language_id = this.read_scalar(language_id)?.to_u32()?;
|
||||
let buffer = this.read_pointer(buffer)?;
|
||||
let size = this.read_scalar(size)?.to_u32()?;
|
||||
let _arguments = this.read_pointer(arguments)?;
|
||||
|
||||
// We only support `FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS`
|
||||
// This also means `arguments` can be ignored.
|
||||
if flags != 4096u32 | 512u32 {
|
||||
throw_unsup_format!("FormatMessageW: unsupported flags {flags:#x}");
|
||||
}
|
||||
|
||||
let error = this.try_errnum_to_io_error(message_id)?;
|
||||
let formatted = match error {
|
||||
Some(err) => format!("{err}"),
|
||||
None => format!("<unknown error in FormatMessageW: {message_id}>"),
|
||||
};
|
||||
let (complete, length) = this.write_os_str_to_wide_str(
|
||||
OsStr::new(&formatted),
|
||||
buffer,
|
||||
size.into(),
|
||||
/*trunacte*/ false,
|
||||
)?;
|
||||
if !complete {
|
||||
// The API docs don't say what happens when the buffer is not big enough...
|
||||
// Let's just bail.
|
||||
throw_unsup_format!("FormatMessageW: buffer not big enough");
|
||||
}
|
||||
// The return value is the number of characters stored *excluding* the null terminator.
|
||||
this.write_int(length.checked_sub(1).unwrap(), dest)?;
|
||||
}
|
||||
|
||||
// Incomplete shims that we "stub out" just to get pre-main initialization code to work.
|
||||
// These shims are enabled only when the caller is in the standard library.
|
||||
|
|
|
|||
|
|
@ -664,54 +664,35 @@ fn convert_float_to_int<'tcx>(
|
|||
Ok(())
|
||||
}
|
||||
|
||||
/// Splits `left`, `right` and `dest` (which must be SIMD vectors)
|
||||
/// into 128-bit chuncks.
|
||||
///
|
||||
/// `left`, `right` and `dest` cannot have different types.
|
||||
/// Splits `op` (which must be a SIMD vector) into 128-bit chuncks.
|
||||
///
|
||||
/// Returns a tuple where:
|
||||
/// * The first element is the number of 128-bit chunks (let's call it `N`).
|
||||
/// * The second element is the number of elements per chunk (let's call it `M`).
|
||||
/// * The third element is the `left` vector split into chunks, i.e, it's
|
||||
/// type is `[[T; M]; N]`.
|
||||
/// * The fourth element is the `right` vector split into chunks.
|
||||
/// * The fifth element is the `dest` vector split into chunks.
|
||||
fn split_simd_to_128bit_chunks<'tcx>(
|
||||
/// * The third element is the `op` vector split into chunks, i.e, it's
|
||||
/// type is `[[T; M]; N]` where `T` is the element type of `op`.
|
||||
fn split_simd_to_128bit_chunks<'tcx, P: Projectable<'tcx, Provenance>>(
|
||||
this: &mut crate::MiriInterpCx<'_, 'tcx>,
|
||||
left: &OpTy<'tcx, Provenance>,
|
||||
right: &OpTy<'tcx, Provenance>,
|
||||
dest: &MPlaceTy<'tcx, Provenance>,
|
||||
) -> InterpResult<
|
||||
'tcx,
|
||||
(u64, u64, MPlaceTy<'tcx, Provenance>, MPlaceTy<'tcx, Provenance>, MPlaceTy<'tcx, Provenance>),
|
||||
> {
|
||||
assert_eq!(dest.layout, left.layout);
|
||||
assert_eq!(dest.layout, right.layout);
|
||||
op: &P,
|
||||
) -> InterpResult<'tcx, (u64, u64, P)> {
|
||||
let simd_layout = op.layout();
|
||||
let (simd_len, element_ty) = simd_layout.ty.simd_size_and_type(this.tcx.tcx);
|
||||
|
||||
let (left, left_len) = this.operand_to_simd(left)?;
|
||||
let (right, right_len) = this.operand_to_simd(right)?;
|
||||
let (dest, dest_len) = this.mplace_to_simd(dest)?;
|
||||
|
||||
assert_eq!(dest_len, left_len);
|
||||
assert_eq!(dest_len, right_len);
|
||||
|
||||
assert_eq!(dest.layout.size.bits() % 128, 0);
|
||||
let num_chunks = dest.layout.size.bits() / 128;
|
||||
assert_eq!(dest_len.checked_rem(num_chunks), Some(0));
|
||||
let items_per_chunk = dest_len.checked_div(num_chunks).unwrap();
|
||||
assert_eq!(simd_layout.size.bits() % 128, 0);
|
||||
let num_chunks = simd_layout.size.bits() / 128;
|
||||
let items_per_chunk = simd_len.checked_div(num_chunks).unwrap();
|
||||
|
||||
// Transmute to `[[T; items_per_chunk]; num_chunks]`
|
||||
let element_layout = left.layout.field(this, 0);
|
||||
let chunked_layout = this.layout_of(Ty::new_array(
|
||||
this.tcx.tcx,
|
||||
Ty::new_array(this.tcx.tcx, element_layout.ty, items_per_chunk),
|
||||
num_chunks,
|
||||
))?;
|
||||
let left = left.transmute(chunked_layout, this)?;
|
||||
let right = right.transmute(chunked_layout, this)?;
|
||||
let dest = dest.transmute(chunked_layout, this)?;
|
||||
let chunked_layout = this
|
||||
.layout_of(Ty::new_array(
|
||||
this.tcx.tcx,
|
||||
Ty::new_array(this.tcx.tcx, element_ty, items_per_chunk),
|
||||
num_chunks,
|
||||
))
|
||||
.unwrap();
|
||||
let chunked_op = op.transmute(chunked_layout, this)?;
|
||||
|
||||
Ok((num_chunks, items_per_chunk, left, right, dest))
|
||||
Ok((num_chunks, items_per_chunk, chunked_op))
|
||||
}
|
||||
|
||||
/// Horizontaly performs `which` operation on adjacent values of
|
||||
|
|
@ -731,8 +712,12 @@ fn horizontal_bin_op<'tcx>(
|
|||
right: &OpTy<'tcx, Provenance>,
|
||||
dest: &MPlaceTy<'tcx, Provenance>,
|
||||
) -> InterpResult<'tcx, ()> {
|
||||
let (num_chunks, items_per_chunk, left, right, dest) =
|
||||
split_simd_to_128bit_chunks(this, left, right, dest)?;
|
||||
assert_eq!(left.layout, dest.layout);
|
||||
assert_eq!(right.layout, dest.layout);
|
||||
|
||||
let (num_chunks, items_per_chunk, left) = split_simd_to_128bit_chunks(this, left)?;
|
||||
let (_, _, right) = split_simd_to_128bit_chunks(this, right)?;
|
||||
let (_, _, dest) = split_simd_to_128bit_chunks(this, dest)?;
|
||||
|
||||
let middle = items_per_chunk / 2;
|
||||
for i in 0..num_chunks {
|
||||
|
|
@ -779,8 +764,12 @@ fn conditional_dot_product<'tcx>(
|
|||
imm: &OpTy<'tcx, Provenance>,
|
||||
dest: &MPlaceTy<'tcx, Provenance>,
|
||||
) -> InterpResult<'tcx, ()> {
|
||||
let (num_chunks, items_per_chunk, left, right, dest) =
|
||||
split_simd_to_128bit_chunks(this, left, right, dest)?;
|
||||
assert_eq!(left.layout, dest.layout);
|
||||
assert_eq!(right.layout, dest.layout);
|
||||
|
||||
let (num_chunks, items_per_chunk, left) = split_simd_to_128bit_chunks(this, left)?;
|
||||
let (_, _, right) = split_simd_to_128bit_chunks(this, right)?;
|
||||
let (_, _, dest) = split_simd_to_128bit_chunks(this, dest)?;
|
||||
|
||||
let element_layout = left.layout.field(this, 0).field(this, 0);
|
||||
assert!(items_per_chunk <= 4);
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ fn test_errors() {
|
|||
// Opening a non-existing file should fail with a "not found" error.
|
||||
assert_eq!(ErrorKind::NotFound, File::open(&path).unwrap_err().kind());
|
||||
// Make sure we can also format this.
|
||||
format!("{0:?}: {0}", File::open(&path).unwrap_err());
|
||||
format!("{0}: {0:?}", File::open(&path).unwrap_err());
|
||||
// Removing a non-existing file should fail with a "not found" error.
|
||||
assert_eq!(ErrorKind::NotFound, remove_file(&path).unwrap_err().kind());
|
||||
// Reading the metadata of a non-existing file should fail with a "not found" error.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,19 @@
|
|||
use std::io::IsTerminal;
|
||||
use std::io::{self, IsTerminal};
|
||||
|
||||
fn main() {
|
||||
// We can't really assume that this is truly a terminal, and anyway on Windows Miri will always
|
||||
// return `false` here, but we can check that the call succeeds.
|
||||
std::io::stdout().is_terminal();
|
||||
io::stdout().is_terminal();
|
||||
|
||||
// Ensure we can format `io::Error` created from OS errors
|
||||
// (calls OS-specific error formatting functions).
|
||||
let raw_os_error = if cfg!(unix) {
|
||||
22 // EINVAL (on most Unixes, anyway)
|
||||
} else if cfg!(windows) {
|
||||
87 // ERROR_INVALID_PARAMETER
|
||||
} else {
|
||||
panic!("unsupported OS")
|
||||
};
|
||||
let err = io::Error::from_raw_os_error(raw_os_error);
|
||||
format!("{err}: {err:?}");
|
||||
}
|
||||
|
|
|
|||
38
src/tools/miri/tests/pass/shims/path.rs
Normal file
38
src/tools/miri/tests/pass/shims/path.rs
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
//@compile-flags: -Zmiri-disable-isolation
|
||||
#![feature(absolute_path)]
|
||||
use std::path::{absolute, Path};
|
||||
|
||||
#[track_caller]
|
||||
fn test_absolute(in_: &str, out: &str) {
|
||||
assert_eq!(absolute(in_).unwrap().as_os_str(), Path::new(out).as_os_str());
|
||||
}
|
||||
|
||||
fn main() {
|
||||
if cfg!(unix) {
|
||||
test_absolute("/a/b/c", "/a/b/c");
|
||||
test_absolute("/a/b/c", "/a/b/c");
|
||||
test_absolute("/a//b/c", "/a/b/c");
|
||||
test_absolute("//a/b/c", "//a/b/c");
|
||||
test_absolute("///a/b/c", "/a/b/c");
|
||||
test_absolute("/a/b/c/", "/a/b/c/");
|
||||
test_absolute("/a/./b/../c/.././..", "/a/b/../c/../..");
|
||||
} else if cfg!(windows) {
|
||||
// Test that all these are unchanged
|
||||
test_absolute(r"C:\path\to\file", r"C:\path\to\file");
|
||||
test_absolute(r"C:\path\to\file\", r"C:\path\to\file\");
|
||||
test_absolute(r"\\server\share\to\file", r"\\server\share\to\file");
|
||||
test_absolute(r"\\server.\share.\to\file", r"\\server.\share.\to\file");
|
||||
test_absolute(r"\\.\PIPE\name", r"\\.\PIPE\name");
|
||||
test_absolute(r"\\.\C:\path\to\COM1", r"\\.\C:\path\to\COM1");
|
||||
test_absolute(r"\\?\C:\path\to\file", r"\\?\C:\path\to\file");
|
||||
test_absolute(r"\\?\UNC\server\share\to\file", r"\\?\UNC\server\share\to\file");
|
||||
test_absolute(r"\\?\PIPE\name", r"\\?\PIPE\name");
|
||||
// Verbatim paths are always unchanged, no matter what.
|
||||
test_absolute(r"\\?\path.\to/file..", r"\\?\path.\to/file..");
|
||||
|
||||
test_absolute(r"C:\path..\to.\file.", r"C:\path..\to\file");
|
||||
test_absolute(r"COM1", r"\\.\COM1");
|
||||
} else {
|
||||
panic!("unsupported OS");
|
||||
}
|
||||
}
|
||||
|
|
@ -112,6 +112,13 @@ fn run_tests(
|
|||
config.program.envs.push(("RUST_BACKTRACE".into(), Some("1".into())));
|
||||
|
||||
// Add some flags we always want.
|
||||
config.program.args.push(
|
||||
format!(
|
||||
"--sysroot={}",
|
||||
env::var("MIRI_SYSROOT").expect("MIRI_SYSROOT must be set to run the ui test suite")
|
||||
)
|
||||
.into(),
|
||||
);
|
||||
config.program.args.push("-Dwarnings".into());
|
||||
config.program.args.push("-Dunused".into());
|
||||
config.program.args.push("-Ainternal_features".into());
|
||||
|
|
@ -296,12 +303,13 @@ fn main() -> Result<()> {
|
|||
|
||||
fn run_dep_mode(target: String, mut args: impl Iterator<Item = OsString>) -> Result<()> {
|
||||
let path = args.next().expect("./miri run-dep must be followed by a file name");
|
||||
let config = miri_config(
|
||||
let mut config = miri_config(
|
||||
&target,
|
||||
"",
|
||||
Mode::Yolo { rustfix: RustfixMode::Disabled },
|
||||
/* with dependencies */ true,
|
||||
);
|
||||
config.program.args.clear(); // remove the `--error-format` that ui_test adds by default
|
||||
let dep_args = config.build_dependencies()?;
|
||||
|
||||
let mut cmd = config.program.build(&config.out_dir);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
/// uniz is nor a builtin nor pass as arguments so is unexpected
|
||||
#[cfg(uniz)]
|
||||
|
|
@ -5,7 +5,7 @@ LL | #[cfg(uniz)]
|
|||
| ^^^^ help: there is a config with a similar name: `unix`
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(uniz)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
warning: unexpected `cfg` condition value
|
||||
--> $DIR/check-cfg-test.rs:9:7
|
||||
|
|
||||
LL | #[cfg(feature = "invalid")]
|
||||
| ^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `feature` are: test
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
//@ check-fail
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
error: the `-Z unstable-options` flag must also be passed to enable the flag `check-cfg`
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ LL | #[cfg(feature = "invalid")]
|
|||
|
|
||||
= note: expected values for `feature` are: `test`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("invalid"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// This test check that #![allow(unexpected_cfgs)] works with --cfg
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --cfg=unexpected --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --cfg=unexpected --check-cfg=cfg()
|
||||
|
||||
#![allow(unexpected_cfgs)]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// This test check that local #[allow(unexpected_cfgs)] works
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#[allow(unexpected_cfgs)]
|
||||
fn foo() {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// This test check that #[allow(unexpected_cfgs)] doesn't work if put on the same level
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#[allow(unexpected_cfgs)]
|
||||
#[cfg(FALSE)]
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ LL | #[cfg(FALSE)]
|
|||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(FALSE)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// This test check that a top-level #![allow(unexpected_cfgs)] works
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#![allow(unexpected_cfgs)]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// This test check that #[allow(unexpected_cfgs)] work if put on an upper level
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#[allow(unexpected_cfgs)]
|
||||
mod aa {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
warning: unexpected `cfg` condition value: `serde`
|
||||
--> $DIR/cargo-feature.rs:14:7
|
||||
--> $DIR/cargo-feature.rs:13:7
|
||||
|
|
||||
LL | #[cfg(feature = "serde")]
|
||||
| ^^^^^^^^^^^^^^^^^ help: remove the condition
|
||||
|
|
@ -10,7 +10,7 @@ LL | #[cfg(feature = "serde")]
|
|||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: (none)
|
||||
--> $DIR/cargo-feature.rs:18:7
|
||||
--> $DIR/cargo-feature.rs:17:7
|
||||
|
|
||||
LL | #[cfg(feature)]
|
||||
| ^^^^^^^ help: remove the condition
|
||||
|
|
@ -20,7 +20,7 @@ LL | #[cfg(feature)]
|
|||
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `tokio_unstable`
|
||||
--> $DIR/cargo-feature.rs:22:7
|
||||
--> $DIR/cargo-feature.rs:21:7
|
||||
|
|
||||
LL | #[cfg(tokio_unstable)]
|
||||
| ^^^^^^^^^^^^^^
|
||||
|
|
@ -30,7 +30,7 @@ LL | #[cfg(tokio_unstable)]
|
|||
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `CONFIG_NVME`
|
||||
--> $DIR/cargo-feature.rs:26:7
|
||||
--> $DIR/cargo-feature.rs:25:7
|
||||
|
|
||||
LL | #[cfg(CONFIG_NVME = "m")]
|
||||
| ^^^^^^^^^^^^^^^^^
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
//@ check-pass
|
||||
//@ revisions: some none
|
||||
//@ rustc-env:CARGO_CRATE_NAME=foo
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ [none]compile-flags: --check-cfg=cfg(feature,values())
|
||||
//@ [some]compile-flags: --check-cfg=cfg(feature,values("bitcode"))
|
||||
//@ [some]compile-flags: --check-cfg=cfg(CONFIG_NVME,values("y"))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
warning: unexpected `cfg` condition value: `serde`
|
||||
--> $DIR/cargo-feature.rs:14:7
|
||||
--> $DIR/cargo-feature.rs:13:7
|
||||
|
|
||||
LL | #[cfg(feature = "serde")]
|
||||
| ^^^^^^^^^^^^^^^^^
|
||||
|
|
@ -10,7 +10,7 @@ LL | #[cfg(feature = "serde")]
|
|||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: (none)
|
||||
--> $DIR/cargo-feature.rs:18:7
|
||||
--> $DIR/cargo-feature.rs:17:7
|
||||
|
|
||||
LL | #[cfg(feature)]
|
||||
| ^^^^^^^- help: specify a config value: `= "bitcode"`
|
||||
|
|
@ -20,7 +20,7 @@ LL | #[cfg(feature)]
|
|||
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `tokio_unstable`
|
||||
--> $DIR/cargo-feature.rs:22:7
|
||||
--> $DIR/cargo-feature.rs:21:7
|
||||
|
|
||||
LL | #[cfg(tokio_unstable)]
|
||||
| ^^^^^^^^^^^^^^
|
||||
|
|
@ -30,7 +30,7 @@ LL | #[cfg(tokio_unstable)]
|
|||
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `m`
|
||||
--> $DIR/cargo-feature.rs:26:7
|
||||
--> $DIR/cargo-feature.rs:25:7
|
||||
|
|
||||
LL | #[cfg(CONFIG_NVME = "m")]
|
||||
| ^^^^^^^^^^^^^^---
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
// This test checks we won't suggest more than 3 span suggestions for cfg names
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg(foo,values("value")) --check-cfg=cfg(bar,values("value")) --check-cfg=cfg(bee,values("value")) --check-cfg=cfg(cow,values("value"))
|
||||
|
||||
#[cfg(value)]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
warning: unexpected `cfg` condition name: `value`
|
||||
--> $DIR/cfg-value-for-cfg-name-duplicate.rs:8:7
|
||||
--> $DIR/cfg-value-for-cfg-name-duplicate.rs:7:7
|
||||
|
|
||||
LL | #[cfg(value)]
|
||||
| ^^^^^
|
||||
|
|
||||
= help: expected names are: `bar`, `bee`, `clippy`, `cow`, `debug_assertions`, `doc`, `doctest`, `foo`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(value)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
// This test checks that when a single cfg has a value for user's specified name
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg(foo,values("my_value")) --check-cfg=cfg(bar,values("my_value"))
|
||||
|
||||
#[cfg(my_value)]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
warning: unexpected `cfg` condition name: `my_value`
|
||||
--> $DIR/cfg-value-for-cfg-name-multiple.rs:8:7
|
||||
--> $DIR/cfg-value-for-cfg-name-multiple.rs:7:7
|
||||
|
|
||||
LL | #[cfg(my_value)]
|
||||
| ^^^^^^^^
|
||||
|
|
||||
= help: expected names are: `bar`, `clippy`, `debug_assertions`, `doc`, `doctest`, `foo`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(my_value)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
help: found config with similar value
|
||||
|
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
// suggest to use `#[cfg(target_os = "linux")]` instead of `#[cfg(linux)]`
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#[cfg(linux)]
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
warning: unexpected `cfg` condition name: `linux`
|
||||
--> $DIR/cfg-value-for-cfg-name.rs:9:7
|
||||
--> $DIR/cfg-value-for-cfg-name.rs:8:7
|
||||
|
|
||||
LL | #[cfg(linux)]
|
||||
| ^^^^^ help: found config with similar value: `target_os = "linux"`
|
||||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(linux)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition name: `linux`
|
||||
--> $DIR/cfg-value-for-cfg-name.rs:14:7
|
||||
--> $DIR/cfg-value-for-cfg-name.rs:13:7
|
||||
|
|
||||
LL | #[cfg(linux = "os-name")]
|
||||
| ^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(linux, values("os-name"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 2 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// This test check that we correctly emit an warning for compact cfg
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#![feature(cfg_target_compact)]
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ LL | #[cfg(target(os = "linux", architecture = "arm"))]
|
|||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(target_architecture, values("arm"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// This test check that we correctly emit an warning for compact cfg
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#![feature(cfg_target_compact)]
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ LL | #[cfg(target(os = "linux", pointer_width = "X"))]
|
|||
| ^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `target_pointer_width` are: `16`, `32`, `64`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
//@ check-pass
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg(my_cfg,values("foo")) --check-cfg=cfg(my_cfg,values("bar"))
|
||||
//@ compile-flags: --check-cfg=cfg(my_cfg,values())
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
warning: unexpected `cfg` condition value: (none)
|
||||
--> $DIR/concat-values.rs:6:7
|
||||
--> $DIR/concat-values.rs:5:7
|
||||
|
|
||||
LL | #[cfg(my_cfg)]
|
||||
| ^^^^^^
|
||||
|
|
||||
= note: expected values for `my_cfg` are: `bar`, `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(my_cfg)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: `unk`
|
||||
--> $DIR/concat-values.rs:10:7
|
||||
--> $DIR/concat-values.rs:9:7
|
||||
|
|
||||
LL | #[cfg(my_cfg = "unk")]
|
||||
| ^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `my_cfg` are: `bar`, `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(my_cfg, values("unk"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 2 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
//@ revisions: cargo rustc
|
||||
//@ [rustc]unset-rustc-env:CARGO_CRATE_NAME
|
||||
//@ [cargo]rustc-env:CARGO_CRATE_NAME=foo
|
||||
//@ compile-flags: --check-cfg=cfg(feature,values("foo")) --check-cfg=cfg(no_values) -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg(feature,values("foo")) --check-cfg=cfg(no_values)
|
||||
|
||||
#[cfg(featur)]
|
||||
//~^ WARNING unexpected `cfg` condition name
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ LL | #[cfg(featur)]
|
|||
|
|
||||
= help: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(featur)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition name: `featur`
|
||||
|
|
@ -16,7 +16,7 @@ LL | #[cfg(featur = "foo")]
|
|||
| ^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(featur, values("foo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
help: there is a config with a similar name and value
|
||||
|
|
||||
LL | #[cfg(feature = "foo")]
|
||||
|
|
@ -30,7 +30,7 @@ LL | #[cfg(featur = "fo")]
|
|||
|
|
||||
= help: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(featur, values("fo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
help: there is a config with a similar name and different values
|
||||
|
|
||||
LL | #[cfg(feature = "foo")]
|
||||
|
|
@ -43,7 +43,7 @@ LL | #[cfg(no_value)]
|
|||
| ^^^^^^^^ help: there is a config with a similar name: `no_values`
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(no_value)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `no_value`
|
||||
--> $DIR/diagnotics.rs:26:7
|
||||
|
|
@ -52,7 +52,7 @@ LL | #[cfg(no_value = "foo")]
|
|||
| ^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(no_value, values("foo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
help: there is a config with a similar name and no value
|
||||
|
|
||||
LL | #[cfg(no_values)]
|
||||
|
|
@ -68,7 +68,7 @@ LL | #[cfg(no_values = "bar")]
|
|||
|
|
||||
= note: no expected value for `no_values`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(no_values, values("bar"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 6 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Check that we detect unexpected value when none are allowed
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg(foo,values()) -Zunstable-options
|
||||
//@ compile-flags: --check-cfg=cfg(foo,values())
|
||||
|
||||
#[cfg(foo = "foo")]
|
||||
//~^ WARNING unexpected `cfg` condition value
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ LL | #[cfg(foo = "foo")]
|
|||
|
|
||||
= note: no expected values for `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(foo, values("foo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: (none)
|
||||
|
|
@ -17,7 +17,7 @@ LL | #[cfg(foo)]
|
|||
|
|
||||
= note: no expected values for `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(foo)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 2 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
warning: unexpected `cfg` condition name: `unknown_key`
|
||||
--> $DIR/exhaustive-names-values.rs:10:7
|
||||
--> $DIR/exhaustive-names-values.rs:9:7
|
||||
|
|
||||
LL | #[cfg(unknown_key = "value")]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(unknown_key, values("value"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: `value`
|
||||
--> $DIR/exhaustive-names-values.rs:14:7
|
||||
--> $DIR/exhaustive-names-values.rs:13:7
|
||||
|
|
||||
LL | #[cfg(test = "value")]
|
||||
| ^^^^----------
|
||||
|
|
@ -18,25 +18,25 @@ LL | #[cfg(test = "value")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `feature`
|
||||
--> $DIR/exhaustive-names-values.rs:18:7
|
||||
--> $DIR/exhaustive-names-values.rs:17:7
|
||||
|
|
||||
LL | #[cfg(feature = "unk")]
|
||||
| ^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("unk"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `feature`
|
||||
--> $DIR/exhaustive-names-values.rs:25:7
|
||||
--> $DIR/exhaustive-names-values.rs:24:7
|
||||
|
|
||||
LL | #[cfg(feature = "std")]
|
||||
| ^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("std"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 4 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
warning: unexpected `cfg` condition name: `unknown_key`
|
||||
--> $DIR/exhaustive-names-values.rs:10:7
|
||||
--> $DIR/exhaustive-names-values.rs:9:7
|
||||
|
|
||||
LL | #[cfg(unknown_key = "value")]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(unknown_key, values("value"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: `value`
|
||||
--> $DIR/exhaustive-names-values.rs:14:7
|
||||
--> $DIR/exhaustive-names-values.rs:13:7
|
||||
|
|
||||
LL | #[cfg(test = "value")]
|
||||
| ^^^^----------
|
||||
|
|
@ -18,17 +18,17 @@ LL | #[cfg(test = "value")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `unk`
|
||||
--> $DIR/exhaustive-names-values.rs:18:7
|
||||
--> $DIR/exhaustive-names-values.rs:17:7
|
||||
|
|
||||
LL | #[cfg(feature = "unk")]
|
||||
| ^^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `feature` are: `std`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("unk"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 3 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
warning: unexpected `cfg` condition name: `unknown_key`
|
||||
--> $DIR/exhaustive-names-values.rs:10:7
|
||||
--> $DIR/exhaustive-names-values.rs:9:7
|
||||
|
|
||||
LL | #[cfg(unknown_key = "value")]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(unknown_key, values("value"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: `value`
|
||||
--> $DIR/exhaustive-names-values.rs:14:7
|
||||
--> $DIR/exhaustive-names-values.rs:13:7
|
||||
|
|
||||
LL | #[cfg(test = "value")]
|
||||
| ^^^^----------
|
||||
|
|
@ -18,17 +18,17 @@ LL | #[cfg(test = "value")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `unk`
|
||||
--> $DIR/exhaustive-names-values.rs:18:7
|
||||
--> $DIR/exhaustive-names-values.rs:17:7
|
||||
|
|
||||
LL | #[cfg(feature = "unk")]
|
||||
| ^^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `feature` are: `std`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("unk"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 3 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
//
|
||||
//@ check-pass
|
||||
//@ revisions: empty_cfg feature full
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ [empty_cfg]compile-flags: --check-cfg=cfg()
|
||||
//@ [feature]compile-flags: --check-cfg=cfg(feature,values("std"))
|
||||
//@ [full]compile-flags: --check-cfg=cfg(feature,values("std")) --check-cfg=cfg()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Check warning for unexpected cfg
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg()
|
||||
|
||||
#[cfg(unknown_key = "value")]
|
||||
//~^ WARNING unexpected `cfg` condition name
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ LL | #[cfg(unknown_key = "value")]
|
|||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(unknown_key, values("value"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ LL | #[cfg(test = "value")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
//
|
||||
//@ check-pass
|
||||
//@ revisions: empty_cfg without_names
|
||||
//@ [empty_cfg]compile-flags: --check-cfg=cfg() -Z unstable-options
|
||||
//@ [without_names]compile-flags: --check-cfg=cfg(any()) -Z unstable-options
|
||||
//@ [empty_cfg]compile-flags: --check-cfg=cfg()
|
||||
//@ [without_names]compile-flags: --check-cfg=cfg(any())
|
||||
|
||||
#[cfg(test = "value")]
|
||||
//~^ WARNING unexpected `cfg` condition value
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ LL | #[cfg(test = "value")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
//@ revisions: mixed_values_any mixed_any any_values giberich unterminated
|
||||
//@ revisions: none_not_empty cfg_none
|
||||
//
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ [anything_else]compile-flags: --check-cfg=anything_else(...)
|
||||
//@ [string_for_name_1]compile-flags: --check-cfg=cfg("NOT_IDENT")
|
||||
//@ [string_for_name_2]compile-flags: --check-cfg=cfg(foo,"NOT_IDENT",bar)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
// we correctly lint on the `cfg!` macro and `cfg_attr` attribute.
|
||||
//
|
||||
//@ check-pass
|
||||
//@ compile-flags: --cfg feature="bar" --cfg unknown_name -Z unstable-options
|
||||
//@ compile-flags: --cfg feature="bar" --cfg unknown_name
|
||||
//@ compile-flags: --check-cfg=cfg(feature,values("foo"))
|
||||
|
||||
#[cfg(windows)]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ LL | #[cfg(widnows)]
|
|||
| ^^^^^^^ help: there is a config with a similar name: `windows`
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(widnows)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: (none)
|
||||
|
|
@ -16,7 +16,7 @@ LL | #[cfg(feature)]
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `bar`
|
||||
--> $DIR/mix.rs:23:7
|
||||
|
|
@ -26,7 +26,7 @@ LL | #[cfg(feature = "bar")]
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("bar"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:27:7
|
||||
|
|
@ -36,7 +36,7 @@ LL | #[cfg(feature = "zebra")]
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `uu`
|
||||
--> $DIR/mix.rs:31:12
|
||||
|
|
@ -46,7 +46,7 @@ LL | #[cfg_attr(uu, test)]
|
|||
|
|
||||
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `doctest`, `feature`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(uu)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `widnows`
|
||||
--> $DIR/mix.rs:40:10
|
||||
|
|
@ -55,7 +55,7 @@ LL | cfg!(widnows);
|
|||
| ^^^^^^^ help: there is a config with a similar name: `windows`
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(widnows)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `bar`
|
||||
--> $DIR/mix.rs:43:10
|
||||
|
|
@ -65,7 +65,7 @@ LL | cfg!(feature = "bar");
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("bar"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:45:10
|
||||
|
|
@ -75,7 +75,7 @@ LL | cfg!(feature = "zebra");
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:47:10
|
||||
|
|
@ -84,7 +84,7 @@ LL | cfg!(xxx = "foo");
|
|||
| ^^^^^^^^^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx, values("foo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:49:10
|
||||
|
|
@ -93,7 +93,7 @@ LL | cfg!(xxx);
|
|||
| ^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:51:14
|
||||
|
|
@ -102,7 +102,7 @@ LL | cfg!(any(xxx, windows));
|
|||
| ^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `bad`
|
||||
--> $DIR/mix.rs:53:14
|
||||
|
|
@ -112,7 +112,7 @@ LL | cfg!(any(feature = "bad", windows));
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("bad"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:55:23
|
||||
|
|
@ -121,7 +121,7 @@ LL | cfg!(any(windows, xxx));
|
|||
| ^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:57:20
|
||||
|
|
@ -130,7 +130,7 @@ LL | cfg!(all(unix, xxx));
|
|||
| ^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `aa`
|
||||
--> $DIR/mix.rs:59:14
|
||||
|
|
@ -139,7 +139,7 @@ LL | cfg!(all(aa, bb));
|
|||
| ^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(aa)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `bb`
|
||||
--> $DIR/mix.rs:59:18
|
||||
|
|
@ -148,7 +148,7 @@ LL | cfg!(all(aa, bb));
|
|||
| ^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(bb)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `aa`
|
||||
--> $DIR/mix.rs:62:14
|
||||
|
|
@ -157,7 +157,7 @@ LL | cfg!(any(aa, bb));
|
|||
| ^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(aa)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `bb`
|
||||
--> $DIR/mix.rs:62:18
|
||||
|
|
@ -166,7 +166,7 @@ LL | cfg!(any(aa, bb));
|
|||
| ^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(bb)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:65:20
|
||||
|
|
@ -176,7 +176,7 @@ LL | cfg!(any(unix, feature = "zebra"));
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:67:14
|
||||
|
|
@ -185,7 +185,7 @@ LL | cfg!(any(xxx, feature = "zebra"));
|
|||
| ^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:67:19
|
||||
|
|
@ -195,7 +195,7 @@ LL | cfg!(any(xxx, feature = "zebra"));
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:70:14
|
||||
|
|
@ -204,7 +204,7 @@ LL | cfg!(any(xxx, unix, xxx));
|
|||
| ^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition name: `xxx`
|
||||
--> $DIR/mix.rs:70:25
|
||||
|
|
@ -213,7 +213,7 @@ LL | cfg!(any(xxx, unix, xxx));
|
|||
| ^^^
|
||||
|
|
||||
= help: to expect this configuration use `--check-cfg=cfg(xxx)`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:73:14
|
||||
|
|
@ -223,7 +223,7 @@ LL | cfg!(all(feature = "zebra", feature = "zebra", feature = "zebra"));
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:73:33
|
||||
|
|
@ -233,7 +233,7 @@ LL | cfg!(all(feature = "zebra", feature = "zebra", feature = "zebra"));
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:73:52
|
||||
|
|
@ -243,7 +243,7 @@ LL | cfg!(all(feature = "zebra", feature = "zebra", feature = "zebra"));
|
|||
|
|
||||
= note: expected values for `feature` are: `foo`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: unexpected `cfg` condition value: `zebra`
|
||||
--> $DIR/mix.rs:77:10
|
||||
|
|
@ -252,7 +252,7 @@ LL | cfg!(target_feature = "zebra");
|
|||
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512er`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512pf`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2` and 187 more
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 27 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
warning: unexpected `cfg` condition value: `foo`
|
||||
--> $DIR/no-expected-values.rs:11:7
|
||||
--> $DIR/no-expected-values.rs:10:7
|
||||
|
|
||||
LL | #[cfg(feature = "foo")]
|
||||
| ^^^^^^^--------
|
||||
|
|
@ -8,11 +8,11 @@ LL | #[cfg(feature = "foo")]
|
|||
|
|
||||
= note: no expected value for `feature`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("foo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: `foo`
|
||||
--> $DIR/no-expected-values.rs:15:7
|
||||
--> $DIR/no-expected-values.rs:14:7
|
||||
|
|
||||
LL | #[cfg(test = "foo")]
|
||||
| ^^^^--------
|
||||
|
|
@ -20,7 +20,7 @@ LL | #[cfg(test = "foo")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 2 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
warning: unexpected `cfg` condition value: `foo`
|
||||
--> $DIR/no-expected-values.rs:11:7
|
||||
--> $DIR/no-expected-values.rs:10:7
|
||||
|
|
||||
LL | #[cfg(feature = "foo")]
|
||||
| ^^^^^^^--------
|
||||
|
|
@ -8,11 +8,11 @@ LL | #[cfg(feature = "foo")]
|
|||
|
|
||||
= note: no expected value for `feature`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("foo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: `foo`
|
||||
--> $DIR/no-expected-values.rs:15:7
|
||||
--> $DIR/no-expected-values.rs:14:7
|
||||
|
|
||||
LL | #[cfg(test = "foo")]
|
||||
| ^^^^--------
|
||||
|
|
@ -20,7 +20,7 @@ LL | #[cfg(test = "foo")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 2 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
//
|
||||
//@ check-pass
|
||||
//@ revisions: simple mixed empty
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg(values,simple,mixed,empty)
|
||||
//@ [simple]compile-flags: --check-cfg=cfg(test) --check-cfg=cfg(feature)
|
||||
//@ [mixed]compile-flags: --check-cfg=cfg(test,feature)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
warning: unexpected `cfg` condition value: `foo`
|
||||
--> $DIR/no-expected-values.rs:11:7
|
||||
--> $DIR/no-expected-values.rs:10:7
|
||||
|
|
||||
LL | #[cfg(feature = "foo")]
|
||||
| ^^^^^^^--------
|
||||
|
|
@ -8,11 +8,11 @@ LL | #[cfg(feature = "foo")]
|
|||
|
|
||||
= note: no expected value for `feature`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(feature, values("foo"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: unexpected `cfg` condition value: `foo`
|
||||
--> $DIR/no-expected-values.rs:15:7
|
||||
--> $DIR/no-expected-values.rs:14:7
|
||||
|
|
||||
LL | #[cfg(test = "foo")]
|
||||
| ^^^^--------
|
||||
|
|
@ -20,7 +20,7 @@ LL | #[cfg(test = "foo")]
|
|||
| help: remove the value
|
||||
|
|
||||
= note: no expected value for `test`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
|
||||
warning: 2 warnings emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
//@ check-pass
|
||||
//
|
||||
//@ revisions: values_before values_after
|
||||
//@ compile-flags: -Z unstable-options
|
||||
//@ compile-flags: --check-cfg=cfg(values_before,values_after)
|
||||
//
|
||||
//@ [values_before]compile-flags: --check-cfg=cfg(a,values("b")) --check-cfg=cfg(a)
|
||||
//@ [values_after]compile-flags: --check-cfg=cfg(a) --check-cfg=cfg(a,values("b"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
warning: unexpected `cfg` condition value: `unk`
|
||||
--> $DIR/order-independant.rs:13:7
|
||||
--> $DIR/order-independant.rs:11:7
|
||||
|
|
||||
LL | #[cfg(a = "unk")]
|
||||
| ^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `a` are: (none), `b`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(a, values("unk"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
warning: unexpected `cfg` condition value: `unk`
|
||||
--> $DIR/order-independant.rs:13:7
|
||||
--> $DIR/order-independant.rs:11:7
|
||||
|
|
||||
LL | #[cfg(a = "unk")]
|
||||
| ^^^^^^^^^
|
||||
|
|
||||
= note: expected values for `a` are: (none), `b`
|
||||
= help: to expect this configuration use `--check-cfg=cfg(a, values("unk"))`
|
||||
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
|
||||
= note: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue