Skip to content

Commit 823bacb

Browse files
dtolnaydtolnay
committed
Revert "Suggest using Arc on !Send/!Sync types"
This reverts commit 9de1a47.
1 parent 4120936 commit 823bacb

File tree

113 files changed

+13
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+13
-223
lines changed

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2743,12 +2743,6 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
27432743
}
27442744
ObligationCauseCode::BindingObligation(item_def_id, span)
27452745
| ObligationCauseCode::ExprBindingObligation(item_def_id, span, ..) => {
2746-
if self.tcx.is_diagnostic_item(sym::Send, item_def_id)
2747-
|| self.tcx.lang_items().sync_trait() == Some(item_def_id)
2748-
{
2749-
return;
2750-
}
2751-
27522746
let item_name = tcx.def_path_str(item_def_id);
27532747
let short_item_name = with_forced_trimmed_paths!(tcx.def_path_str(item_def_id));
27542748
let mut multispan = MultiSpan::from(span);

‎library/core/src/marker.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,8 @@ macro marker_impls {
7676
#[stable(feature = "rust1", since = "1.0.0")]
7777
#[cfg_attr(not(test), rustc_diagnostic_item = "Send")]
7878
#[rustc_on_unimplemented(
79-
on(_Self = "std::rc::Rc<T, A>", note = "use `std::sync::Arc` instead of `std::rc::Rc`"),
8079
message = "`{Self}` cannot be sent between threads safely",
81-
label = "`{Self}` cannot be sent between threads safely",
82-
note = "consider using `std::sync::Arc<{Self}>`; for more information visit \
83-
<https://doc.rust-lang.org/book/ch16-03-shared-state.html>"
80+
label = "`{Self}` cannot be sent between threads safely"
8481
)]
8582
pub unsafe auto trait Send {
8683
// empty.
@@ -631,11 +628,8 @@ impl<T: ?Sized> Copy for &T {}
631628
any(_Self = "core::cell::RefCell<T>", _Self = "std::cell::RefCell<T>"),
632629
note = "if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead",
633630
),
634-
on(_Self = "std::rc::Rc<T, A>", note = "use `std::sync::Arc` instead of `std::rc::Rc`"),
635631
message = "`{Self}` cannot be shared between threads safely",
636-
label = "`{Self}` cannot be shared between threads safely",
637-
note = "consider using `std::sync::Arc<{Self}>`; for more information visit \
638-
<https://doc.rust-lang.org/book/ch16-03-shared-state.html>"
632+
label = "`{Self}` cannot be shared between threads safely"
639633
)]
640634
pub unsafe auto trait Sync {
641635
// FIXME(estebank): once support to add notes in `rustc_on_unimplemented`

‎tests/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | type C: Clone + Iterator<Item: Send + Iterator<Item: for<'a> Lam<&'a u8
55
| ^^^^ `<<Self as Case1>::C as Iterator>::Item` cannot be sent between threads safely
66
|
77
= help: the trait `Send` is not implemented for `<<Self as Case1>::C as Iterator>::Item`
8-
= note: consider using `std::sync::Arc<<<Self as Case1>::C as Iterator>::Item>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
98
help: consider further restricting the associated type
109
|
1110
LL | trait Case1 where <<Self as Case1>::C as Iterator>::Item: Send {
@@ -30,7 +29,6 @@ LL | type C: Clone + Iterator<Item: Send + Iterator<Item: for<'a> Lam<&'a u8
3029
| ^^^^ `<<Self as Case1>::C as Iterator>::Item` cannot be shared between threads safely
3130
|
3231
= help: the trait `Sync` is not implemented for `<<Self as Case1>::C as Iterator>::Item`
33-
= note: consider using `std::sync::Arc<<<Self as Case1>::C as Iterator>::Item>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
3432
help: consider further restricting the associated type
3533
|
3634
LL | trait Case1 where <<Self as Case1>::C as Iterator>::Item: Sync {

‎tests/ui/associated-type-bounds/return-type-notation/basic.without.stderr‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | is_send(foo::<T>());
1414
| ^^^^^^^^^^ future returned by `foo` is not `Send`
1515
|
1616
= help: within `impl Future<Output = Result<(), ()>>`, the trait `Send` is not implemented for `impl Future<Output = Result<(), ()>>`
17-
= note: consider using `std::sync::Arc<impl Future<Output = Result<(), ()>>>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
1817
note: future is not `Send` as it awaits another future which is not `Send`
1918
--> $DIR/basic.rs:13:5
2019
|

‎tests/ui/async-await/async-await-let-else.drop_tracking.stderr‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | is_send(foo(Some(true)));
55
| ^^^^^^^^^^^^^^^ future returned by `foo` is not `Send`
66
|
77
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
8-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
98
note: future is not `Send` as this value is used across an await
109
--> $DIR/async-await-let-else.rs:11:15
1110
|
@@ -33,7 +32,6 @@ LL | is_send(foo2(Some(true)));
3332
| required by a bound introduced by this call
3433
|
3534
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
36-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
3735
note: required because it's used within this `async fn` body
3836
--> $DIR/async-await-let-else.rs:27:29
3937
|
@@ -66,7 +64,6 @@ LL | is_send(foo3(Some(true)));
6664
| ^^^^^^^^^^^^^^^^ future returned by `foo3` is not `Send`
6765
|
6866
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
69-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
7067
note: future is not `Send` as this value is used across an await
7168
--> $DIR/async-await-let-else.rs:33:29
7269
|
@@ -88,7 +85,6 @@ LL | is_send(foo4(Some(true)));
8885
| ^^^^^^^^^^^^^^^^ future returned by `foo4` is not `Send`
8986
|
9087
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
91-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
9288
note: future is not `Send` as this value is used across an await
9389
--> $DIR/async-await-let-else.rs:41:15
9490
|

‎tests/ui/async-await/async-await-let-else.drop_tracking_mir.stderr‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | is_send(foo(Some(true)));
55
| ^^^^^^^^^^^^^^^ future returned by `foo` is not `Send`
66
|
77
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
8-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
98
note: future is not `Send` as this value is used across an await
109
--> $DIR/async-await-let-else.rs:11:15
1110
|
@@ -31,7 +30,6 @@ LL | is_send(foo2(Some(true)));
3130
| required by a bound introduced by this call
3231
|
3332
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
34-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
3533
note: required because it's used within this `async fn` body
3634
--> $DIR/async-await-let-else.rs:27:29
3735
|
@@ -64,7 +62,6 @@ LL | is_send(foo3(Some(true)));
6462
| ^^^^^^^^^^^^^^^^ future returned by `foo3` is not `Send`
6563
|
6664
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
67-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
6865
note: future is not `Send` as this value is used across an await
6966
--> $DIR/async-await-let-else.rs:33:29
7067
|
@@ -85,7 +82,6 @@ LL | is_send(foo4(Some(true)));
8582
| ^^^^^^^^^^^^^^^^ future returned by `foo4` is not `Send`
8683
|
8784
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
88-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
8985
note: future is not `Send` as this value is used across an await
9086
--> $DIR/async-await-let-else.rs:41:15
9187
|

‎tests/ui/async-await/async-await-let-else.no_drop_tracking.stderr‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | is_send(foo(Some(true)));
55
| ^^^^^^^^^^^^^^^ future returned by `foo` is not `Send`
66
|
77
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
8-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
98
note: future is not `Send` as this value is used across an await
109
--> $DIR/async-await-let-else.rs:11:15
1110
|
@@ -28,7 +27,6 @@ LL | is_send(foo2(Some(true)));
2827
| ^^^^^^^^^^^^^^^^ future returned by `foo2` is not `Send`
2928
|
3029
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
31-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
3230
note: future is not `Send` as this value is used across an await
3331
--> $DIR/async-await-let-else.rs:23:27
3432
|
@@ -51,7 +49,6 @@ LL | is_send(foo3(Some(true)));
5149
| ^^^^^^^^^^^^^^^^ future returned by `foo3` is not `Send`
5250
|
5351
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
54-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
5552
note: future is not `Send` as this value is used across an await
5653
--> $DIR/async-await-let-else.rs:33:29
5754
|
@@ -73,7 +70,6 @@ LL | is_send(foo4(Some(true)));
7370
| ^^^^^^^^^^^^^^^^ future returned by `foo4` is not `Send`
7471
|
7572
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
76-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
7773
note: future is not `Send` as this value is used across an await
7874
--> $DIR/async-await-let-else.rs:41:15
7975
|

‎tests/ui/async-await/async-fn-nonsend.drop_tracking.stderr‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | assert_send(non_send_temporary_in_match());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_send_temporary_in_match` is not `Send`
66
|
77
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
8-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
98
note: future is not `Send` as this value is used across an await
109
--> $DIR/async-fn-nonsend.rs:36:26
1110
|
@@ -29,7 +28,6 @@ LL | assert_send(non_sync_with_method_call());
2928
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`
3029
|
3130
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `dyn std::fmt::Write`
32-
= note: consider using `std::sync::Arc<dyn std::fmt::Write>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
3331
note: future is not `Send` as this value is used across an await
3432
--> $DIR/async-fn-nonsend.rs:49:15
3533
|

‎tests/ui/async-await/async-fn-nonsend.drop_tracking_mir.stderr‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | assert_send(non_send_temporary_in_match());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_send_temporary_in_match` is not `Send`
66
|
77
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
8-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
98
note: future is not `Send` as this value is used across an await
109
--> $DIR/async-fn-nonsend.rs:36:26
1110
|
@@ -26,7 +25,6 @@ LL | assert_send(non_sync_with_method_call());
2625
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`
2726
|
2827
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `dyn std::fmt::Write`
29-
= note: consider using `std::sync::Arc<dyn std::fmt::Write>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
3028
note: future is not `Send` as this value is used across an await
3129
--> $DIR/async-fn-nonsend.rs:49:15
3230
|

‎tests/ui/async-await/async-fn-nonsend.no_drop_tracking.stderr‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | assert_send(local_dropped_before_await());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `local_dropped_before_await` is not `Send`
66
|
77
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
8-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
98
note: future is not `Send` as this value is used across an await
109
--> $DIR/async-fn-nonsend.rs:27:11
1110
|
@@ -29,7 +28,6 @@ LL | assert_send(non_send_temporary_in_match());
2928
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_send_temporary_in_match` is not `Send`
3029
|
3130
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `Rc<()>`
32-
= note: use `std::sync::Arc` instead of `std::rc::Rc`
3331
note: future is not `Send` as this value is used across an await
3432
--> $DIR/async-fn-nonsend.rs:36:26
3533
|
@@ -53,7 +51,6 @@ LL | assert_send(non_sync_with_method_call());
5351
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`
5452
|
5553
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `dyn std::fmt::Write`
56-
= note: consider using `std::sync::Arc<dyn std::fmt::Write>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
5754
note: future is not `Send` as this value is used across an await
5855
--> $DIR/async-fn-nonsend.rs:49:15
5956
|
@@ -78,7 +75,6 @@ LL | assert_send(non_sync_with_method_call_panic());
7875
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_sync_with_method_call_panic` is not `Send`
7976
|
8077
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `dyn std::fmt::Write`
81-
= note: consider using `std::sync::Arc<dyn std::fmt::Write>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
8278
note: future is not `Send` as this value is used across an await
8379
--> $DIR/async-fn-nonsend.rs:56:15
8480
|
@@ -103,7 +99,6 @@ LL | assert_send(non_sync_with_method_call_infinite_loop());
10399
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ future returned by `non_sync_with_method_call_infinite_loop` is not `Send`
104100
|
105101
= help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `dyn std::fmt::Write`
106-
= note: consider using `std::sync::Arc<dyn std::fmt::Write>`; for more information visit <https://doc.rust-lang.org/book/ch16-03-shared-state.html>
107102
note: future is not `Send` as this value is used across an await
108103
--> $DIR/async-fn-nonsend.rs:63:15
109104
|

0 commit comments

Comments
 (0)