Skip to content

Rollup of 8 pull requests #140282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Apr 25, 2025
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fc126df
Update the index.html of Option to make the summary more comprehensive
Natural-selection1 Mar 26, 2025
159ae8f
Keeps the inspect() classification the same as in Result
Natural-selection1 Mar 26, 2025
edfef42
ensure compiler existance of tools on the dist step
onur-ozkan Apr 18, 2025
4ba9fff
add regression test for dist compilation
onur-ozkan Apr 18, 2025
ea0b6cb
Solved suggestions
Natural-selection1 Apr 21, 2025
90fe280
Move `sys::pal::os::Env` into `sys::env`
thaliaarchi Apr 22, 2025
6518bcb
Fix `unsafe_op_in_unsafe_fn` for Unix env
thaliaarchi Apr 22, 2025
1b00ebe
Update !DynSend and !DynSync platform impls
thaliaarchi Apr 22, 2025
4695212
Deduplicate unsupported env items
thaliaarchi Apr 22, 2025
01485c9
Unify owned `Env` types between platforms
thaliaarchi Apr 22, 2025
7493e1c
Make #![feature(let_chains)] bootstrap conditional in compiler/
est31 Apr 23, 2025
c0446d3
keep the original text for is_some and is_none
Natural-selection1 Apr 24, 2025
d0ac97d
add examples using .as_ref() for is_some_and and is_none_or
Natural-selection1 Apr 24, 2025
d8528c6
Some drive-by housecleaning in `rustc_borrowck`
amandasystems Apr 24, 2025
e5e3a95
norm nested aliases before evaluating the parent goal
lcnr Apr 24, 2025
75a9be6
Deprecate the unstable `concat_idents!`
tgross35 Feb 26, 2025
1d0b3be
Don't use item name to look up associated item from trait item
compiler-errors Apr 25, 2025
84a921d
Rollup merge of #137653 - tgross35:deprecate-concat_idents, r=working…
matthiaskrgr Apr 25, 2025
59191fa
Rollup merge of #138957 - Natural-selection1:update-Option-doc, r=Ama…
matthiaskrgr Apr 25, 2025
8868163
Rollup merge of #140006 - onur-ozkan:138778, r=onur-ozkan
matthiaskrgr Apr 25, 2025
f3641df
Rollup merge of #140143 - thaliaarchi:move-env-pal, r=joboet
matthiaskrgr Apr 25, 2025
564e5cc
Rollup merge of #140202 - est31:let_chains_feature_compiler, r=lcnr
matthiaskrgr Apr 25, 2025
9eb0078
Rollup merge of #140236 - lcnr:normalizes-to-goals, r=compiler-errors
matthiaskrgr Apr 25, 2025
e534fad
Rollup merge of #140257 - amandasystems:housecleaning, r=wesleywiser
matthiaskrgr Apr 25, 2025
3c08a50
Rollup merge of #140278 - compiler-errors:name-based-comparison, r=nn…
matthiaskrgr Apr 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update !DynSend and !DynSync platform impls
These have grown out of sync with the platforms.
  • Loading branch information
thaliaarchi committed Apr 22, 2025
commit 1b00ebefdfffc88dbcbf6057d156c5e62434ad43
22 changes: 18 additions & 4 deletions compiler/rustc_data_structures/src/marker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,15 @@ impls_dyn_send_neg!(
[std::io::StderrLock<'_>]
);

#[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))]
// Consistent with `std`, `os_imp::Env` is `!Sync` in these platforms
#[cfg(any(
unix,
target_os = "hermit",
all(target_vendor = "fortanix", target_env = "sgx"),
target_os = "solid_asp3",
target_os = "wasi",
target_os = "xous"
))]
// Consistent with `std`, `env_imp::Env` is `!Sync` in these platforms
impl !DynSend for std::env::VarsOs {}

macro_rules! already_send {
Expand Down Expand Up @@ -106,8 +113,15 @@ impls_dyn_sync_neg!(
[std::sync::mpsc::Sender<T> where T]
);

#[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))]
// Consistent with `std`, `os_imp::Env` is `!Sync` in these platforms
#[cfg(any(
unix,
target_os = "hermit",
all(target_vendor = "fortanix", target_env = "sgx"),
target_os = "solid_asp3",
target_os = "wasi",
target_os = "xous"
))]
// Consistent with `std`, `env_imp::Env` is `!Sync` in these platforms
impl !DynSync for std::env::VarsOs {}

macro_rules! already_sync {
Expand Down
Loading