07e7823c01
If a symbol name can only be imported from one place for a type, and as long as it was not glob-imported anywhere in the current crate, we can trim its printed path and print only the name. This has wide implications on error messages with types, for example, shortening `std::vec::Vec` to just `Vec`, as long as there is no other `Vec` importable anywhere. This adds a new '-Z trim-diagnostic-paths=false' option to control this feature. On the good path, with no diagnosis printed, we should try to avoid issuing this query, so we need to prevent trimmed_def_paths query on several cases. This change also relies on a previous commit that differentiates between `Debug` and `Display` on various rustc types, where the latter is trimmed and presented to the user and the former is not.
56 lines
1.2 KiB
Rust
56 lines
1.2 KiB
Rust
#![feature(generators, generator_trait)]
|
|
|
|
use std::{
|
|
cell::RefCell,
|
|
sync::Arc,
|
|
pin::Pin,
|
|
ops::{Generator, GeneratorState},
|
|
};
|
|
|
|
pub struct Ready<T>(Option<T>);
|
|
impl<T> Generator<()> for Ready<T> {
|
|
type Return = T;
|
|
type Yield = ();
|
|
fn resume(mut self: Pin<&mut Self>, _args: ()) -> GeneratorState<(), T> {
|
|
GeneratorState::Complete(self.0.take().unwrap())
|
|
}
|
|
}
|
|
pub fn make_gen1<T>(t: T) -> Ready<T> {
|
|
Ready(Some(t))
|
|
}
|
|
|
|
fn require_send(_: impl Send) {}
|
|
|
|
fn make_non_send_generator() -> impl Generator<Return = Arc<RefCell<i32>>> {
|
|
make_gen1(Arc::new(RefCell::new(0)))
|
|
}
|
|
|
|
fn test1() {
|
|
let send_gen = || {
|
|
let _non_send_gen = make_non_send_generator();
|
|
yield;
|
|
};
|
|
require_send(send_gen);
|
|
//~^ ERROR generator cannot be sent between threads
|
|
}
|
|
|
|
pub fn make_gen2<T>(t: T) -> impl Generator<Return = T> {
|
|
|| {
|
|
yield;
|
|
t
|
|
}
|
|
}
|
|
fn make_non_send_generator2() -> impl Generator<Return = Arc<RefCell<i32>>> {
|
|
make_gen2(Arc::new(RefCell::new(0)))
|
|
}
|
|
|
|
fn test2() {
|
|
let send_gen = || {
|
|
let _non_send_gen = make_non_send_generator2();
|
|
yield;
|
|
};
|
|
require_send(send_gen);
|
|
//~^ ERROR `RefCell<i32>` cannot be shared between threads safely
|
|
}
|
|
|
|
fn main() {}
|