Skip to content

Commit a605441

Browse files
borsbors
committed
Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
Rollup of 6 pull requests Successful merges: - #67255 (Remove i686-unknown-dragonfly target) - #67267 (Fix signature of `__wasilibc_find_relpath`) - #67282 (Fix example code of OpenOptions::open) - #67289 (Do not ICE on unnamed future) - #67300 (Restore original implementation of Vec::retain) - #67305 (Doc typo) Failed merges: r? @ghost
2 parents fc6b5d6 + e5c3441 commit a605441

File tree

10 files changed

+96
-45
lines changed

10 files changed

+96
-45
lines changed

‎src/liballoc/vec.rs

+16-1
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,22 @@ impl<T> Vec<T> {
10791079
pub fn retain<F>(&mut self, mut f: F)
10801080
where F: FnMut(&T) -> bool
10811081
{
1082-
self.drain_filter(|x| !f(x));
1082+
let len = self.len();
1083+
let mut del = 0;
1084+
{
1085+
let v = &mut **self;
1086+
1087+
for i in 0..len {
1088+
if !f(&v[i]) {
1089+
del += 1;
1090+
} else if del > 0 {
1091+
v.swap(i - del, i);
1092+
}
1093+
}
1094+
}
1095+
if del > 0 {
1096+
self.truncate(len - del);
1097+
}
10831098
}
10841099

10851100
/// Removes all but the first of consecutive elements in the vector that resolve to the same

‎src/libcore/num/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ NonZeroI8 NonZeroI16 NonZeroI32 NonZeroI64 NonZeroI128 NonZeroIsize }
144144

145145
/// Provides intentionally-wrapped arithmetic on `T`.
146146
///
147-
/// Operations like `+` on `u32` values is intended to never overflow,
147+
/// Operations like `+` on `u32` values are intended to never overflow,
148148
/// and in some debug configurations overflow is detected and results
149149
/// in a panic. While most arithmetic falls into this category, some
150150
/// code explicitly expects and relies upon modular arithmetic (e.g.,

‎src/librustc/hir/map/mod.rs

+10-3
Original file line numberDiff line numberDiff line change
@@ -1016,8 +1016,8 @@ impl<'hir> Map<'hir> {
10161016
}
10171017
}
10181018

1019-
pub fn name(&self, id: HirId) -> Name {
1020-
match self.get(id) {
1019+
pub fn opt_name(&self, id: HirId) -> Option<Name> {
1020+
Some(match self.get(id) {
10211021
Node::Item(i) => i.ident.name,
10221022
Node::ForeignItem(fi) => fi.ident.name,
10231023
Node::ImplItem(ii) => ii.ident.name,
@@ -1028,7 +1028,14 @@ impl<'hir> Map<'hir> {
10281028
Node::GenericParam(param) => param.name.ident().name,
10291029
Node::Binding(&Pat { kind: PatKind::Binding(_, _, l, _), .. }) => l.name,
10301030
Node::Ctor(..) => self.name(self.get_parent_item(id)),
1031-
_ => bug!("no name for {}", self.node_to_string(id))
1031+
_ => return None,
1032+
})
1033+
}
1034+
1035+
pub fn name(&self, id: HirId) -> Name {
1036+
match self.opt_name(id) {
1037+
Some(name) => name,
1038+
None => bug!("no name for {}", self.node_to_string(id)),
10321039
}
10331040
}
10341041

‎src/librustc/traits/error_reporting.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2404,7 +2404,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
24042404
let message = if let Some(name) = last_generator
24052405
.and_then(|generator_did| self.tcx.parent(generator_did))
24062406
.and_then(|parent_did| self.tcx.hir().as_local_hir_id(parent_did))
2407-
.map(|parent_hir_id| self.tcx.hir().name(parent_hir_id))
2407+
.and_then(|parent_hir_id| self.tcx.hir().opt_name(parent_hir_id))
24082408
{
24092409
format!("future returned by `{}` is not {}", name, trait_name)
24102410
} else {

‎src/librustc_target/spec/i686_unknown_dragonfly.rs

-23
This file was deleted.

‎src/librustc_target/spec/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ supported_targets! {
398398
("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
399399
("x86_64-unknown-freebsd", x86_64_unknown_freebsd),
400400

401-
("i686-unknown-dragonfly", i686_unknown_dragonfly),
402401
("x86_64-unknown-dragonfly", x86_64_unknown_dragonfly),
403402

404403
("aarch64-unknown-openbsd", aarch64_unknown_openbsd),

‎src/libstd/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ impl OpenOptions {
936936
/// ```no_run
937937
/// use std::fs::OpenOptions;
938938
///
939-
/// let file = OpenOptions::new().open("foo.txt");
939+
/// let file = OpenOptions::new().read(true).open("foo.txt");
940940
/// ```
941941
///
942942
/// [`ErrorKind`]: ../io/enum.ErrorKind.html

‎src/libstd/sys/wasi/fs.rs

+21-14
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ impl OpenOptions {
364364

365365
impl File {
366366
pub fn open(path: &Path, opts: &OpenOptions) -> io::Result<File> {
367-
let (dir, file) = open_parent(path, wasi::RIGHTS_PATH_OPEN)?;
367+
let (dir, file) = open_parent(path)?;
368368
open_at(&dir, &file, opts)
369369
}
370370

@@ -452,7 +452,7 @@ impl DirBuilder {
452452
}
453453

454454
pub fn mkdir(&self, p: &Path) -> io::Result<()> {
455-
let (dir, file) = open_parent(p, wasi::RIGHTS_PATH_CREATE_DIRECTORY)?;
455+
let (dir, file) = open_parent(p)?;
456456
dir.create_directory(osstr2str(file.as_ref())?)
457457
}
458458
}
@@ -478,13 +478,13 @@ pub fn readdir(p: &Path) -> io::Result<ReadDir> {
478478
}
479479

480480
pub fn unlink(p: &Path) -> io::Result<()> {
481-
let (dir, file) = open_parent(p, wasi::RIGHTS_PATH_UNLINK_FILE)?;
481+
let (dir, file) = open_parent(p)?;
482482
dir.unlink_file(osstr2str(file.as_ref())?)
483483
}
484484

485485
pub fn rename(old: &Path, new: &Path) -> io::Result<()> {
486-
let (old, old_file) = open_parent(old, wasi::RIGHTS_PATH_RENAME_SOURCE)?;
487-
let (new, new_file) = open_parent(new, wasi::RIGHTS_PATH_RENAME_TARGET)?;
486+
let (old, old_file) = open_parent(old)?;
487+
let (new, new_file) = open_parent(new)?;
488488
old.rename(osstr2str(old_file.as_ref())?, &new, osstr2str(new_file.as_ref())?)
489489
}
490490

@@ -495,12 +495,12 @@ pub fn set_perm(_p: &Path, _perm: FilePermissions) -> io::Result<()> {
495495
}
496496

497497
pub fn rmdir(p: &Path) -> io::Result<()> {
498-
let (dir, file) = open_parent(p, wasi::RIGHTS_PATH_REMOVE_DIRECTORY)?;
498+
let (dir, file) = open_parent(p)?;
499499
dir.remove_directory(osstr2str(file.as_ref())?)
500500
}
501501

502502
pub fn readlink(p: &Path) -> io::Result<PathBuf> {
503-
let (dir, file) = open_parent(p, wasi::RIGHTS_PATH_READLINK)?;
503+
let (dir, file) = open_parent(p)?;
504504
read_link(&dir, &file)
505505
}
506506

@@ -536,13 +536,13 @@ fn read_link(fd: &WasiFd, file: &Path) -> io::Result<PathBuf> {
536536
}
537537

538538
pub fn symlink(src: &Path, dst: &Path) -> io::Result<()> {
539-
let (dst, dst_file) = open_parent(dst, wasi::RIGHTS_PATH_SYMLINK)?;
539+
let (dst, dst_file) = open_parent(dst)?;
540540
dst.symlink(osstr2str(src.as_ref())?, osstr2str(dst_file.as_ref())?)
541541
}
542542

543543
pub fn link(src: &Path, dst: &Path) -> io::Result<()> {
544-
let (src, src_file) = open_parent(src, wasi::RIGHTS_PATH_LINK_SOURCE)?;
545-
let (dst, dst_file) = open_parent(dst, wasi::RIGHTS_PATH_LINK_TARGET)?;
544+
let (src, src_file) = open_parent(src)?;
545+
let (dst, dst_file) = open_parent(dst)?;
546546
src.link(
547547
wasi::LOOKUPFLAGS_SYMLINK_FOLLOW,
548548
osstr2str(src_file.as_ref())?,
@@ -552,12 +552,12 @@ pub fn link(src: &Path, dst: &Path) -> io::Result<()> {
552552
}
553553

554554
pub fn stat(p: &Path) -> io::Result<FileAttr> {
555-
let (dir, file) = open_parent(p, wasi::RIGHTS_PATH_FILESTAT_GET)?;
555+
let (dir, file) = open_parent(p)?;
556556
metadata_at(&dir, wasi::LOOKUPFLAGS_SYMLINK_FOLLOW, &file)
557557
}
558558

559559
pub fn lstat(p: &Path) -> io::Result<FileAttr> {
560-
let (dir, file) = open_parent(p, wasi::RIGHTS_PATH_FILESTAT_GET)?;
560+
let (dir, file) = open_parent(p)?;
561561
metadata_at(&dir, 0, &file)
562562
}
563563

@@ -611,11 +611,11 @@ fn open_at(fd: &WasiFd, path: &Path, opts: &OpenOptions) -> io::Result<File> {
611611
///
612612
/// Note that this can fail if `p` doesn't look like it can be opened relative
613613
/// to any preopened file descriptor.
614-
fn open_parent(p: &Path, rights: wasi::Rights) -> io::Result<(ManuallyDrop<WasiFd>, PathBuf)> {
614+
fn open_parent(p: &Path) -> io::Result<(ManuallyDrop<WasiFd>, PathBuf)> {
615615
let p = CString::new(p.as_os_str().as_bytes())?;
616616
unsafe {
617617
let mut ret = ptr::null();
618-
let fd = libc::__wasilibc_find_relpath(p.as_ptr(), rights, 0, &mut ret);
618+
let fd = __wasilibc_find_relpath(p.as_ptr(), &mut ret);
619619
if fd == -1 {
620620
let msg = format!(
621621
"failed to find a preopened file descriptor \
@@ -635,6 +635,13 @@ fn open_parent(p: &Path, rights: wasi::Rights) -> io::Result<(ManuallyDrop<WasiF
635635

636636
return Ok((ManuallyDrop::new(WasiFd::from_raw(fd as u32)), path));
637637
}
638+
639+
extern "C" {
640+
pub fn __wasilibc_find_relpath(
641+
path: *const libc::c_char,
642+
relative_path: *mut *const libc::c_char,
643+
) -> libc::c_int;
644+
}
638645
}
639646

640647
pub fn osstr2str(f: &OsStr) -> io::Result<&str> {

‎src/test/ui/async-await/issue-67252-unnamed-future.rs

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// edition:2018
2+
use std::future::Future;
3+
use std::pin::Pin;
4+
use std::task::{Context, Poll};
5+
6+
fn spawn<T: Send>(_: T) {}
7+
8+
pub struct AFuture;
9+
impl Future for AFuture{
10+
type Output = ();
11+
12+
fn poll(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<()> {
13+
unimplemented!()
14+
}
15+
}
16+
17+
async fn foo() {
18+
spawn(async { //~ ERROR future cannot be sent between threads safely
19+
let _a = std::ptr::null_mut::<()>(); // `*mut ()` is not `Send`
20+
AFuture.await;
21+
});
22+
}
23+
24+
fn main() {}

‎src/test/ui/async-await/issue-67252-unnamed-future.stderr

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
error: future cannot be sent between threads safely
2+
--> $DIR/issue-67252-unnamed-future.rs:18:5
3+
|
4+
LL | fn spawn<T: Send>(_: T) {}
5+
| ----- ---- required by this bound in `spawn`
6+
...
7+
LL | spawn(async {
8+
| ^^^^^ future is not `Send`
9+
|
10+
= help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `*mut ()`
11+
note: future is not `Send` as this value is used across an await
12+
--> $DIR/issue-67252-unnamed-future.rs:20:9
13+
|
14+
LL | let _a = std::ptr::null_mut::<()>(); // `*mut ()` is not `Send`
15+
| -- has type `*mut ()`
16+
LL | AFuture.await;
17+
| ^^^^^^^^^^^^^ await occurs here, with `_a` maybe used later
18+
LL | });
19+
| - `_a` is later dropped here
20+
21+
error: aborting due to previous error
22+

0 commit comments

Comments
 (0)