Auto merge of #129398 - matthiaskrgr:rollup-50l01ry, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #128432 (WASI: forbid `unsafe_op_in_unsafe_fn` for `std::{os, sys}`) - #129373 (Add missing module flags for CFI and KCFI sanitizers) - #129374 (Use `assert_unsafe_precondition!` in `AsciiChar::digit_unchecked`) - #129376 (Change `assert_unsafe_precondition` docs to refer to `check_language_ub`) - #129382 (Add `const_cell_into_inner` to `OnceCell`) - #129387 (Advise against removing the remaining Python scripts from `tests/run-make`) - #129388 (Do not rely on names to find lifetimes.) - #129395 (Pretty-print own args of existential projections (dyn-Trait w/ GAT constraints)) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
bors
commit
8269be147b
@ -11,6 +11,7 @@
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::small_c_str::SmallCStr;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_middle::middle::codegen_fn_attrs::PatchableFunctionEntry;
|
||||
use rustc_middle::mir::mono::CodegenUnit;
|
||||
use rustc_middle::ty::layout::{
|
||||
FnAbiError, FnAbiOfHelpers, FnAbiRequest, HasParamEnv, LayoutError, LayoutOfHelpers,
|
||||
@ -226,6 +227,20 @@ pub unsafe fn create_module<'ll>(
|
||||
}
|
||||
}
|
||||
|
||||
// If we're normalizing integers with CFI, ensure LLVM generated functions do the same.
|
||||
// See https://github.com/llvm/llvm-project/pull/104826
|
||||
if sess.is_sanitizer_cfi_normalize_integers_enabled() {
|
||||
let cfi_normalize_integers = c"cfi-normalize-integers".as_ptr().cast();
|
||||
unsafe {
|
||||
llvm::LLVMRustAddModuleFlagU32(
|
||||
llmod,
|
||||
llvm::LLVMModFlagBehavior::Override,
|
||||
cfi_normalize_integers,
|
||||
1,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Enable LTO unit splitting if specified or if CFI is enabled. (See https://reviews.llvm.org/D53891.)
|
||||
if sess.is_split_lto_unit_enabled() || sess.is_sanitizer_cfi_enabled() {
|
||||
let enable_split_lto_unit = c"EnableSplitLTOUnit".as_ptr();
|
||||
@ -245,6 +260,22 @@ pub unsafe fn create_module<'ll>(
|
||||
unsafe {
|
||||
llvm::LLVMRustAddModuleFlagU32(llmod, llvm::LLVMModFlagBehavior::Override, kcfi, 1);
|
||||
}
|
||||
|
||||
// Add "kcfi-offset" module flag with -Z patchable-function-entry (See
|
||||
// https://reviews.llvm.org/D141172).
|
||||
let pfe =
|
||||
PatchableFunctionEntry::from_config(sess.opts.unstable_opts.patchable_function_entry);
|
||||
if pfe.prefix() > 0 {
|
||||
let kcfi_offset = c"kcfi-offset".as_ptr().cast();
|
||||
unsafe {
|
||||
llvm::LLVMRustAddModuleFlagU32(
|
||||
llmod,
|
||||
llvm::LLVMModFlagBehavior::Override,
|
||||
kcfi_offset,
|
||||
pfe.prefix().into(),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Control Flow Guard is currently only supported by the MSVC linker on Windows.
|
||||
|
||||
@ -3119,7 +3119,10 @@ macro_rules! define_print_and_forward_display {
|
||||
|
||||
ty::ExistentialProjection<'tcx> {
|
||||
let name = cx.tcx().associated_item(self.def_id).name;
|
||||
p!(write("{} = ", name), print(self.term))
|
||||
// The args don't contain the self ty (as it has been erased) but the corresp.
|
||||
// generics do as the trait always has a self ty param. We need to offset.
|
||||
let args = &self.args[cx.tcx().generics_of(self.def_id).parent_count - 1..];
|
||||
p!(path_generic_args(|cx| write!(cx, "{name}"), args), " = ", print(self.term))
|
||||
}
|
||||
|
||||
ty::ProjectionPredicate<'tcx> {
|
||||
|
||||
@ -1099,16 +1099,8 @@ fn msg_span_from_named_region<'tcx>(
|
||||
) -> (String, Option<Span>) {
|
||||
match *region {
|
||||
ty::ReEarlyParam(br) => {
|
||||
let scope = tcx
|
||||
.parent(tcx.generics_of(generic_param_scope).region_param(br, tcx).def_id)
|
||||
.expect_local();
|
||||
let span = if let Some(param) =
|
||||
tcx.hir().get_generics(scope).and_then(|generics| generics.get_named(br.name))
|
||||
{
|
||||
param.span
|
||||
} else {
|
||||
tcx.def_span(scope)
|
||||
};
|
||||
let param_def_id = tcx.generics_of(generic_param_scope).region_param(br, tcx).def_id;
|
||||
let span = tcx.def_span(param_def_id);
|
||||
let text = if br.has_name() {
|
||||
format!("the lifetime `{}` as defined here", br.name)
|
||||
} else {
|
||||
@ -1124,16 +1116,8 @@ fn msg_span_from_named_region<'tcx>(
|
||||
("the anonymous lifetime defined here".to_string(), Some(ty.span))
|
||||
} else {
|
||||
match fr.bound_region {
|
||||
ty::BoundRegionKind::BrNamed(_, name) => {
|
||||
let span = if let Some(param) = tcx
|
||||
.hir()
|
||||
.get_generics(generic_param_scope)
|
||||
.and_then(|generics| generics.get_named(name))
|
||||
{
|
||||
param.span
|
||||
} else {
|
||||
tcx.def_span(generic_param_scope)
|
||||
};
|
||||
ty::BoundRegionKind::BrNamed(param_def_id, name) => {
|
||||
let span = tcx.def_span(param_def_id);
|
||||
let text = if name == kw::UnderscoreLifetime {
|
||||
"the anonymous lifetime as defined here".to_string()
|
||||
} else {
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
//! suggestions from rustc if you get anything slightly wrong in here, and overall
|
||||
//! helps with clarity as we're also referring to `char` intentionally in here.
|
||||
|
||||
use crate::fmt;
|
||||
use crate::mem::transmute;
|
||||
use crate::{assert_unsafe_precondition, fmt};
|
||||
|
||||
/// One of the 128 Unicode characters from U+0000 through U+007F,
|
||||
/// often known as the [ASCII] subset.
|
||||
@ -497,14 +497,18 @@ pub const fn digit(d: u8) -> Option<Self> {
|
||||
/// Notably, it should not be expected to return hex digits, or any other
|
||||
/// reasonable extension of the decimal digits.
|
||||
///
|
||||
/// (This lose safety condition is intended to simplify soundness proofs
|
||||
/// (This loose safety condition is intended to simplify soundness proofs
|
||||
/// when writing code using this method, since the implementation doesn't
|
||||
/// need something really specific, not to make those other arguments do
|
||||
/// something useful. It might be tightened before stabilization.)
|
||||
#[unstable(feature = "ascii_char", issue = "110998")]
|
||||
#[inline]
|
||||
pub const unsafe fn digit_unchecked(d: u8) -> Self {
|
||||
debug_assert!(d < 10);
|
||||
assert_unsafe_precondition!(
|
||||
check_language_ub,
|
||||
"`AsciiChar::digit_unchecked` input cannot exceed 9.",
|
||||
(d: u8 = d) => d < 10
|
||||
);
|
||||
|
||||
// SAFETY: `'0'` through `'9'` are U+00030 through U+0039,
|
||||
// so because `d` must be 64 or less the addition can return at most
|
||||
|
||||
@ -309,7 +309,8 @@ fn try_init<F, E>(&self, f: F) -> Result<&T, E>
|
||||
/// ```
|
||||
#[inline]
|
||||
#[stable(feature = "once_cell", since = "1.70.0")]
|
||||
pub fn into_inner(self) -> Option<T> {
|
||||
#[rustc_const_unstable(feature = "const_cell_into_inner", issue = "78729")]
|
||||
pub const fn into_inner(self) -> Option<T> {
|
||||
// Because `into_inner` takes `self` by value, the compiler statically verifies
|
||||
// that it is not currently borrowed. So it is safe to move out `Option<T>`.
|
||||
self.inner.into_inner()
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
/// macro for language UB are always ignored.
|
||||
///
|
||||
/// This macro should be called as
|
||||
/// `assert_unsafe_precondition!(check_{library,lang}_ub, "message", (ident: type = expr, ident: type = expr) => check_expr)`
|
||||
/// `assert_unsafe_precondition!(check_{library,language}_ub, "message", (ident: type = expr, ident: type = expr) => check_expr)`
|
||||
/// where each `expr` will be evaluated and passed in as function argument `ident: type`. Then all
|
||||
/// those arguments are passed to a function with the body `check_expr`.
|
||||
/// Pick `check_language_ub` when this is guarding a violation of language UB, i.e., immediate UB
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
//!
|
||||
//! [`std::fs`]: crate::fs
|
||||
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![unstable(feature = "wasi_ext", issue = "71213")]
|
||||
|
||||
// Used for `File::read` on intra-doc links
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
#![cfg_attr(not(target_env = "p2"), stable(feature = "rust1", since = "1.0.0"))]
|
||||
#![cfg_attr(target_env = "p2", unstable(feature = "wasip2", issue = "none"))]
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
#![doc(cfg(target_os = "wasi"))]
|
||||
|
||||
pub mod ffi;
|
||||
|
||||
@ -2,4 +2,5 @@
|
||||
//!
|
||||
//! This module is currently empty, but will be filled over time as wasi-libc support for WASI Preview 2 is stabilized.
|
||||
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
#![stable(feature = "raw_ext", since = "1.1.0")]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use crate::ffi::{CStr, OsStr, OsString};
|
||||
use crate::os::wasi::ffi::OsStrExt;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
pub mod os {
|
||||
pub const FAMILY: &str = "";
|
||||
pub const OS: &str = "";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
#![allow(dead_code)]
|
||||
|
||||
use super::err2io;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use super::fd::WasiFd;
|
||||
use crate::ffi::{CStr, OsStr, OsString};
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use crate::{io as std_io, mem};
|
||||
|
||||
#[inline]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use crate::marker::PhantomData;
|
||||
use crate::os::fd::{AsFd, AsRawFd};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use super::err2io;
|
||||
use super::fd::WasiFd;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use core::slice::memchr;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use super::fd::WasiFd;
|
||||
use crate::io::{self, IoSlice, IoSliceMut};
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use crate::ffi::CStr;
|
||||
use crate::num::NonZero;
|
||||
use crate::sys::unsupported;
|
||||
@ -73,13 +75,13 @@ impl Thread {
|
||||
if #[cfg(target_feature = "atomics")] {
|
||||
pub unsafe fn new(stack: usize, p: Box<dyn FnOnce()>) -> io::Result<Thread> {
|
||||
let p = Box::into_raw(Box::new(p));
|
||||
let mut native: libc::pthread_t = mem::zeroed();
|
||||
let mut attr: libc::pthread_attr_t = mem::zeroed();
|
||||
assert_eq!(libc::pthread_attr_init(&mut attr), 0);
|
||||
let mut native: libc::pthread_t = unsafe { mem::zeroed() };
|
||||
let mut attr: libc::pthread_attr_t = unsafe { mem::zeroed() };
|
||||
assert_eq!(unsafe { libc::pthread_attr_init(&mut attr) }, 0);
|
||||
|
||||
let stack_size = cmp::max(stack, DEFAULT_MIN_STACK_SIZE);
|
||||
|
||||
match libc::pthread_attr_setstacksize(&mut attr, stack_size) {
|
||||
match unsafe { libc::pthread_attr_setstacksize(&mut attr, stack_size) } {
|
||||
0 => {}
|
||||
n => {
|
||||
assert_eq!(n, libc::EINVAL);
|
||||
@ -90,20 +92,20 @@ pub unsafe fn new(stack: usize, p: Box<dyn FnOnce()>) -> io::Result<Thread> {
|
||||
let page_size = os::page_size();
|
||||
let stack_size =
|
||||
(stack_size + page_size - 1) & (-(page_size as isize - 1) as usize - 1);
|
||||
assert_eq!(libc::pthread_attr_setstacksize(&mut attr, stack_size), 0);
|
||||
assert_eq!(unsafe { libc::pthread_attr_setstacksize(&mut attr, stack_size) }, 0);
|
||||
}
|
||||
};
|
||||
|
||||
let ret = libc::pthread_create(&mut native, &attr, thread_start, p as *mut _);
|
||||
let ret = unsafe { libc::pthread_create(&mut native, &attr, thread_start, p as *mut _) };
|
||||
// Note: if the thread creation fails and this assert fails, then p will
|
||||
// be leaked. However, an alternative design could cause double-free
|
||||
// which is clearly worse.
|
||||
assert_eq!(libc::pthread_attr_destroy(&mut attr), 0);
|
||||
assert_eq!(unsafe {libc::pthread_attr_destroy(&mut attr) }, 0);
|
||||
|
||||
return if ret != 0 {
|
||||
// The thread failed to start and as a result p was not consumed. Therefore, it is
|
||||
// safe to reconstruct the box so that it gets deallocated.
|
||||
drop(Box::from_raw(p));
|
||||
unsafe { drop(Box::from_raw(p)); }
|
||||
Err(io::Error::from_raw_os_error(ret))
|
||||
} else {
|
||||
Ok(Thread { id: native })
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![forbid(unsafe_op_in_unsafe_fn)]
|
||||
|
||||
use crate::time::Duration;
|
||||
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
// Verifies that "cfi-normalize-integers" module flag is added.
|
||||
//
|
||||
//@ needs-sanitizer-cfi
|
||||
//@ compile-flags: -Clto -Ctarget-feature=-crt-static -Zsanitizer=cfi -Zsanitizer-cfi-normalize-integers
|
||||
|
||||
#![crate_type = "lib"]
|
||||
|
||||
pub fn foo() {}
|
||||
|
||||
// CHECK: !{{[0-9]+}} = !{i32 4, !"cfi-normalize-integers", i32 1}
|
||||
@ -0,0 +1,21 @@
|
||||
// Verifies that "cfi-normalize-integers" module flag is added.
|
||||
//
|
||||
//@ revisions: aarch64 x86_64
|
||||
//@ [aarch64] compile-flags: --target aarch64-unknown-none
|
||||
//@ [aarch64] needs-llvm-components: aarch64
|
||||
//@ [x86_64] compile-flags: --target x86_64-unknown-none
|
||||
//@ [x86_64] needs-llvm-components: x86
|
||||
//@ compile-flags: -Ctarget-feature=-crt-static -Zsanitizer=kcfi -Zsanitizer-cfi-normalize-integers
|
||||
|
||||
#![feature(no_core, lang_items)]
|
||||
#![crate_type = "lib"]
|
||||
#![no_core]
|
||||
|
||||
#[lang = "sized"]
|
||||
trait Sized {}
|
||||
#[lang = "copy"]
|
||||
trait Copy {}
|
||||
|
||||
pub fn foo() {}
|
||||
|
||||
// CHECK: !{{[0-9]+}} = !{i32 4, !"cfi-normalize-integers", i32 1}
|
||||
21
tests/codegen/sanitizer/kcfi/add-kcfi-offset-flag.rs
Normal file
21
tests/codegen/sanitizer/kcfi/add-kcfi-offset-flag.rs
Normal file
@ -0,0 +1,21 @@
|
||||
// Verifies that "kcfi-offset" module flag is added.
|
||||
//
|
||||
//@ revisions: aarch64 x86_64
|
||||
//@ [aarch64] compile-flags: --target aarch64-unknown-none
|
||||
//@ [aarch64] needs-llvm-components: aarch64
|
||||
//@ [x86_64] compile-flags: --target x86_64-unknown-none
|
||||
//@ [x86_64] needs-llvm-components: x86
|
||||
//@ compile-flags: -Ctarget-feature=-crt-static -Zsanitizer=kcfi -Z patchable-function-entry=4,3
|
||||
|
||||
#![feature(no_core, lang_items, patchable_function_entry)]
|
||||
#![crate_type = "lib"]
|
||||
#![no_core]
|
||||
|
||||
#[lang = "sized"]
|
||||
trait Sized {}
|
||||
#[lang = "copy"]
|
||||
trait Copy {}
|
||||
|
||||
pub fn foo() {}
|
||||
|
||||
// CHECK: !{{[0-9]+}} = !{i32 4, !"kcfi-offset", i32 3}
|
||||
@ -1 +0,0 @@
|
||||
# empty
|
||||
@ -1,4 +1,4 @@
|
||||
#![debugger_visualizer(gdb_script_file = "foo.py")]
|
||||
#![debugger_visualizer(gdb_script_file = "my_gdb_script.py")]
|
||||
|
||||
fn main() {
|
||||
const _UNUSED: u32 = {
|
||||
|
||||
@ -0,0 +1,6 @@
|
||||
# This is a Python script, but we don't actually run it.
|
||||
# So if you're trying to remove Python scripts from the test suite,
|
||||
# be aware that there's no value in trying to get rid of this one.
|
||||
#
|
||||
# It just needs to exist so that the compiler can embed it via
|
||||
# `#![debugger_visualizer(gdb_script_file = "...")]`.
|
||||
@ -6,6 +6,6 @@
|
||||
|
||||
fn main() {
|
||||
rustc().emit("dep-info").input("main.rs").run();
|
||||
invalid_utf8_contains("main.d", "foo.py");
|
||||
invalid_utf8_contains("main.d", "my_gdb_script.py");
|
||||
invalid_utf8_contains("main.d", "my_visualizers/bar.natvis");
|
||||
}
|
||||
|
||||
@ -1,5 +1,15 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# Trivial Python script that reads lines from stdin, and checks that each line
|
||||
# is a well-formed XML document.
|
||||
#
|
||||
# This takes advantage of the fact that Python has a built-in XML parser,
|
||||
# whereas doing the same check in Rust would require us to pull in an XML
|
||||
# crate just for this relatively-minor test.
|
||||
#
|
||||
# If you're trying to remove Python scripts from the test suite, think twice
|
||||
# before removing this one. You could do so, but it's probably not worth it.
|
||||
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
|
||||
@ -30,9 +30,9 @@ note: the lifetime `'c` as defined here...
|
||||
LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {
|
||||
| ^^
|
||||
note: ...does not necessarily outlive the lifetime `'c` as defined here
|
||||
--> $DIR/regions-bound-missing-bound-in-impl.rs:27:24
|
||||
--> $DIR/regions-bound-missing-bound-in-impl.rs:12:24
|
||||
|
|
||||
LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {
|
||||
LL | fn wrong_bound1<'b,'c,'d:'a+'b>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>);
|
||||
| ^^
|
||||
|
||||
error[E0308]: method not compatible with trait
|
||||
@ -44,16 +44,15 @@ LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d
|
||||
= note: expected signature `fn(&'a _, Inv<'c>, Inv<'c>, Inv<'_>)`
|
||||
found signature `fn(&'a _, Inv<'_>, Inv<'c>, Inv<'_>)`
|
||||
note: the lifetime `'c` as defined here...
|
||||
--> $DIR/regions-bound-missing-bound-in-impl.rs:27:24
|
||||
--> $DIR/regions-bound-missing-bound-in-impl.rs:12:24
|
||||
|
|
||||
LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {
|
||||
LL | fn wrong_bound1<'b,'c,'d:'a+'b>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>);
|
||||
| ^^
|
||||
note: ...does not necessarily outlive the lifetime `'c` as defined here
|
||||
--> $DIR/regions-bound-missing-bound-in-impl.rs:27:24
|
||||
|
|
||||
LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) {
|
||||
| ^^
|
||||
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
|
||||
|
||||
error[E0195]: lifetime parameters or bounds on method `wrong_bound2` do not match the trait declaration
|
||||
--> $DIR/regions-bound-missing-bound-in-impl.rs:42:20
|
||||
|
||||
@ -48,10 +48,10 @@ LL | const STATIC: &str = "";
|
||||
= note: expected reference `&'static _`
|
||||
found reference `&_`
|
||||
note: the anonymous lifetime as defined here...
|
||||
--> $DIR/elided-lifetime.rs:15:18
|
||||
--> $DIR/elided-lifetime.rs:16:19
|
||||
|
|
||||
LL | impl Bar for Foo<'_> {
|
||||
| ^^
|
||||
LL | const STATIC: &str = "";
|
||||
| ^
|
||||
= note: ...does not necessarily outlive the static lifetime
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
@ -30,10 +30,10 @@ LL | const STATIC: &str = "";
|
||||
= note: expected reference `&_`
|
||||
found reference `&_`
|
||||
note: the anonymous lifetime as defined here...
|
||||
--> $DIR/static-trait-impl.rs:8:10
|
||||
--> $DIR/static-trait-impl.rs:9:19
|
||||
|
|
||||
LL | impl Bar<'_> for A {
|
||||
| ^^
|
||||
LL | const STATIC: &str = "";
|
||||
| ^
|
||||
note: ...does not necessarily outlive the anonymous lifetime as defined here
|
||||
--> $DIR/static-trait-impl.rs:8:10
|
||||
|
|
||||
|
||||
@ -51,7 +51,7 @@ LL | type A<'a> where Self: 'a;
|
||||
= help: the following types implement the trait, consider defining an enum where each variant holds one of these types, implementing `Foo` for this new enum and using it instead:
|
||||
Fooy
|
||||
Fooer<T>
|
||||
= note: required for the cast from `Box<Fooer<{integer}>>` to `Box<(dyn Foo<A = &'a ()> + 'static)>`
|
||||
= note: required for the cast from `Box<Fooer<{integer}>>` to `Box<(dyn Foo<A<'a> = &'a ()> + 'static)>`
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ LL | type SubType<'a>: SubTrait where Self: 'a;
|
||||
= help: consider moving `SubType` to another trait
|
||||
= help: only type `SuperStruct` is seen to implement the trait in this crate, consider using it directly instead
|
||||
= note: `SuperTrait` can be implemented in other crates; if you want to support your users passing their own types here, you can't refer to a specific type
|
||||
= note: required for the cast from `Box<SuperStruct>` to `Box<dyn SuperTrait<SubType = SubStruct<'_>>>`
|
||||
= note: required for the cast from `Box<SuperStruct>` to `Box<dyn SuperTrait<SubType<'_> = SubStruct<'_>>>`
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ LL | type VRefCont<'a>: RefCont<'a, V> where Self: 'a;
|
||||
= help: the following types implement the trait, consider defining an enum where each variant holds one of these types, implementing `MapLike` for this new enum and using it instead:
|
||||
std::collections::BTreeMap<K, V>
|
||||
Source
|
||||
= note: required for the cast from `Box<BTreeMap<u8, u8>>` to `Box<dyn MapLike<u8, u8, VRefCont = (dyn RefCont<'_, u8> + 'static)>>`
|
||||
= note: required for the cast from `Box<BTreeMap<u8, u8>>` to `Box<dyn MapLike<u8, u8, VRefCont<'_> = (dyn RefCont<'_, u8> + 'static)>>`
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ LL | type VRefCont<'a> = &'a V where Self: 'a;
|
||||
= note: expected trait object `(dyn RefCont<'_, u8> + 'static)`
|
||||
found reference `&u8`
|
||||
= help: `&u8` implements `RefCont` so you could box the found value and coerce it to the trait object `Box<dyn RefCont>`, you will have to change the expected type as well
|
||||
= note: required for the cast from `Box<BTreeMap<u8, u8>>` to `Box<dyn MapLike<u8, u8, VRefCont = (dyn RefCont<'_, u8> + 'static)>>`
|
||||
= note: required for the cast from `Box<BTreeMap<u8, u8>>` to `Box<dyn MapLike<u8, u8, VRefCont<'_> = (dyn RefCont<'_, u8> + 'static)>>`
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
||||
@ -5,9 +5,9 @@ LL | fn get<'s>(s: &'s str, _: <&'static &'s () as Project>::Ty) -> &'static
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
note: first, the lifetime cannot outlive the lifetime `'s` as defined here...
|
||||
--> $DIR/impl-implied-bounds-compatibility-unnormalized.rs:11:12
|
||||
--> $DIR/impl-implied-bounds-compatibility-unnormalized.rs:8:12
|
||||
|
|
||||
LL | fn get<'s>(s: &'s str, _: <&'static &'s () as Project>::Ty) -> &'static str {
|
||||
LL | fn get<'s>(s: &'s str, _: ()) -> &'static str;
|
||||
| ^^
|
||||
note: ...so that the method type is compatible with trait
|
||||
--> $DIR/impl-implied-bounds-compatibility-unnormalized.rs:11:5
|
||||
|
||||
@ -5,10 +5,10 @@ LL | fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
note: first, the lifetime cannot outlive the anonymous lifetime as defined here...
|
||||
--> $DIR/issue-20831-debruijn.rs:28:18
|
||||
--> $DIR/issue-20831-debruijn.rs:28:67
|
||||
|
|
||||
LL | fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
|
||||
| ^
|
||||
| ^^^^^^^^^
|
||||
note: ...but the lifetime must also be valid for the lifetime `'a` as defined here...
|
||||
--> $DIR/issue-20831-debruijn.rs:26:6
|
||||
|
|
||||
|
||||
@ -7,10 +7,7 @@ LL | fn next(&'a mut self) -> Option<Self::Item>
|
||||
= note: expected signature `fn(&mut RepeatMut<'_, _>) -> Option<_>`
|
||||
found signature `fn(&'a mut RepeatMut<'_, _>) -> Option<_>`
|
||||
note: the anonymous lifetime as defined here...
|
||||
--> $DIR/issue-37884.rs:6:5
|
||||
|
|
||||
LL | fn next(&'a mut self) -> Option<Self::Item>
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
--> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
|
||||
note: ...does not necessarily outlive the lifetime `'a` as defined here
|
||||
--> $DIR/issue-37884.rs:3:6
|
||||
|
|
||||
|
||||
@ -18,6 +18,10 @@ trait FixedHrtb: for<'a> SuperGeneric<'a, Assoc2 = &'a u8> {}
|
||||
trait AnyDifferentBinders: for<'a> SuperGeneric<'a, Assoc2 = &'a u8> + Super {}
|
||||
trait FixedDifferentBinders: for<'a> SuperGeneric<'a, Assoc2 = &'a u8> + Super<Assoc = u8> {}
|
||||
|
||||
trait HasGat<Outer> {
|
||||
type Assoc<Inner> where Self: Sized;
|
||||
}
|
||||
|
||||
fn dyn_super(x: &dyn Super<Assoc = u8>) { x } //~ERROR mismatched types
|
||||
fn dyn_any(x: &dyn Any<Assoc = u8>) { x } //~ERROR mismatched types
|
||||
fn dyn_fixed(x: &dyn Fixed) { x } //~ERROR mismatched types
|
||||
@ -34,4 +38,7 @@ fn dyn_fixed_hrtb(x: &dyn FixedHrtb) { x } //~ERROR mismatched types
|
||||
fn dyn_any_different_binders(x: &dyn AnyDifferentBinders<Assoc = u8>) { x } //~ERROR mismatched types
|
||||
fn dyn_fixed_different_binders(x: &dyn FixedDifferentBinders) { x } //~ERROR mismatched types
|
||||
|
||||
fn dyn_has_gat(x: &dyn HasGat<u8, Assoc<bool> = ()>) { x } //~ERROR mismatched types
|
||||
//~^ WARN unnecessary associated type bound
|
||||
|
||||
fn main() {}
|
||||
|
||||
@ -1,5 +1,14 @@
|
||||
warning: unnecessary associated type bound for not object safe associated type
|
||||
--> $DIR/pretty.rs:41:35
|
||||
|
|
||||
LL | fn dyn_has_gat(x: &dyn HasGat<u8, Assoc<bool> = ()>) { x }
|
||||
| ^^^^^^^^^^^^^^^^ help: remove this bound
|
||||
|
|
||||
= note: this associated type has a `where Self: Sized` bound, and while the associated type can be specified, it cannot be used because trait objects are never `Sized`
|
||||
= note: `#[warn(unused_associated_type_bounds)]` on by default
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:21:43
|
||||
--> $DIR/pretty.rs:25:43
|
||||
|
|
||||
LL | fn dyn_super(x: &dyn Super<Assoc = u8>) { x }
|
||||
| - ^ expected `()`, found `&dyn Super<Assoc = u8>`
|
||||
@ -10,7 +19,7 @@ LL | fn dyn_super(x: &dyn Super<Assoc = u8>) { x }
|
||||
found reference `&dyn Super<Assoc = u8>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:22:39
|
||||
--> $DIR/pretty.rs:26:39
|
||||
|
|
||||
LL | fn dyn_any(x: &dyn Any<Assoc = u8>) { x }
|
||||
| - ^ expected `()`, found `&dyn Any<Assoc = u8>`
|
||||
@ -21,7 +30,7 @@ LL | fn dyn_any(x: &dyn Any<Assoc = u8>) { x }
|
||||
found reference `&dyn Any<Assoc = u8>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:23:31
|
||||
--> $DIR/pretty.rs:27:31
|
||||
|
|
||||
LL | fn dyn_fixed(x: &dyn Fixed) { x }
|
||||
| - ^ expected `()`, found `&dyn Fixed`
|
||||
@ -32,7 +41,7 @@ LL | fn dyn_fixed(x: &dyn Fixed) { x }
|
||||
found reference `&dyn Fixed`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:24:50
|
||||
--> $DIR/pretty.rs:28:50
|
||||
|
|
||||
LL | fn dyn_fixed_multi(x: &dyn Fixed<Assoc = u16>) { x }
|
||||
| - ^ expected `()`, found `&dyn Fixed<Assoc = u16>`
|
||||
@ -43,7 +52,7 @@ LL | fn dyn_fixed_multi(x: &dyn Fixed<Assoc = u16>) { x }
|
||||
found reference `&dyn Fixed<Assoc = u16>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:25:38
|
||||
--> $DIR/pretty.rs:29:38
|
||||
|
|
||||
LL | fn dyn_fixed_sub(x: &dyn FixedSub) { x }
|
||||
| - ^ expected `()`, found `&dyn FixedSub`
|
||||
@ -54,7 +63,7 @@ LL | fn dyn_fixed_sub(x: &dyn FixedSub) { x }
|
||||
found reference `&dyn FixedSub`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:26:44
|
||||
--> $DIR/pretty.rs:30:44
|
||||
|
|
||||
LL | fn dyn_fixed_static(x: &dyn FixedStatic) { x }
|
||||
| - ^ expected `()`, found `&dyn FixedStatic`
|
||||
@ -65,7 +74,7 @@ LL | fn dyn_fixed_static(x: &dyn FixedStatic) { x }
|
||||
found reference `&dyn FixedStatic`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:28:75
|
||||
--> $DIR/pretty.rs:32:75
|
||||
|
|
||||
LL | fn dyn_super_generic(x: &dyn for<'a> SuperGeneric<'a, Assoc2 = &'a u8>) { x }
|
||||
| - ^ expected `()`, found `&dyn SuperGeneric<'a, Assoc2 = &u8>`
|
||||
@ -76,7 +85,7 @@ LL | fn dyn_super_generic(x: &dyn for<'a> SuperGeneric<'a, Assoc2 = &'a u8>) { x
|
||||
found reference `&dyn for<'a> SuperGeneric<'a, Assoc2 = &'a u8>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:29:71
|
||||
--> $DIR/pretty.rs:33:71
|
||||
|
|
||||
LL | fn dyn_any_generic(x: &dyn for<'a> AnyGeneric<'a, Assoc2 = &'a u8>) { x }
|
||||
| - ^ expected `()`, found `&dyn AnyGeneric<'a, Assoc2 = &u8>`
|
||||
@ -87,7 +96,7 @@ LL | fn dyn_any_generic(x: &dyn for<'a> AnyGeneric<'a, Assoc2 = &'a u8>) { x }
|
||||
found reference `&dyn for<'a> AnyGeneric<'a, Assoc2 = &'a u8>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:30:60
|
||||
--> $DIR/pretty.rs:34:60
|
||||
|
|
||||
LL | fn dyn_fixed_generic1(x: &dyn for<'a> FixedGeneric1<'a>) { x }
|
||||
| - ^ expected `()`, found `&dyn FixedGeneric1<'a>`
|
||||
@ -98,7 +107,7 @@ LL | fn dyn_fixed_generic1(x: &dyn for<'a> FixedGeneric1<'a>) { x }
|
||||
found reference `&dyn for<'a> FixedGeneric1<'a>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:31:60
|
||||
--> $DIR/pretty.rs:35:60
|
||||
|
|
||||
LL | fn dyn_fixed_generic2(x: &dyn for<'a> FixedGeneric2<'a>) { x }
|
||||
| - ^ expected `()`, found `&dyn FixedGeneric2<'a>`
|
||||
@ -109,7 +118,7 @@ LL | fn dyn_fixed_generic2(x: &dyn for<'a> FixedGeneric2<'a>) { x }
|
||||
found reference `&dyn for<'a> FixedGeneric2<'a>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:32:79
|
||||
--> $DIR/pretty.rs:36:79
|
||||
|
|
||||
LL | fn dyn_fixed_generic_multi(x: &dyn for<'a> FixedGeneric1<'a, Assoc2 = &u8>) { x }
|
||||
| - ^ expected `()`, found `&dyn FixedGeneric1<'a, Assoc2 = ...>`
|
||||
@ -120,7 +129,7 @@ LL | fn dyn_fixed_generic_multi(x: &dyn for<'a> FixedGeneric1<'a, Assoc2 = &u8>)
|
||||
found reference `&dyn for<'a> FixedGeneric1<'a, Assoc2 = &u8>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:33:40
|
||||
--> $DIR/pretty.rs:37:40
|
||||
|
|
||||
LL | fn dyn_fixed_hrtb(x: &dyn FixedHrtb) { x }
|
||||
| - ^ expected `()`, found `&dyn FixedHrtb`
|
||||
@ -131,7 +140,7 @@ LL | fn dyn_fixed_hrtb(x: &dyn FixedHrtb) { x }
|
||||
found reference `&dyn FixedHrtb`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:34:73
|
||||
--> $DIR/pretty.rs:38:73
|
||||
|
|
||||
LL | fn dyn_any_different_binders(x: &dyn AnyDifferentBinders<Assoc = u8>) { x }
|
||||
| - ^ expected `()`, found `&dyn AnyDifferentBinders<Assoc = ...>`
|
||||
@ -142,7 +151,7 @@ LL | fn dyn_any_different_binders(x: &dyn AnyDifferentBinders<Assoc = u8>) { x }
|
||||
found reference `&dyn AnyDifferentBinders<Assoc = u8>`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:35:65
|
||||
--> $DIR/pretty.rs:39:65
|
||||
|
|
||||
LL | fn dyn_fixed_different_binders(x: &dyn FixedDifferentBinders) { x }
|
||||
| - ^ expected `()`, found `&dyn FixedDifferentBinders`
|
||||
@ -152,6 +161,17 @@ LL | fn dyn_fixed_different_binders(x: &dyn FixedDifferentBinders) { x }
|
||||
= note: expected unit type `()`
|
||||
found reference `&dyn FixedDifferentBinders`
|
||||
|
||||
error: aborting due to 14 previous errors
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/pretty.rs:41:56
|
||||
|
|
||||
LL | fn dyn_has_gat(x: &dyn HasGat<u8, Assoc<bool> = ()>) { x }
|
||||
| - ^ expected `()`, found `&dyn HasGat<u8, Assoc<bool> = ()>`
|
||||
| |
|
||||
| help: try adding a return type: `-> &dyn HasGat<u8, Assoc<bool> = ()>`
|
||||
|
|
||||
= note: expected unit type `()`
|
||||
found reference `&dyn HasGat<u8, Assoc<bool> = ()>`
|
||||
|
||||
error: aborting due to 15 previous errors; 1 warning emitted
|
||||
|
||||
For more information about this error, try `rustc --explain E0308`.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user