Skip to content

Rollup of 7 pull requests #86891

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.

Sign up for GitHub

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 23 commits into from
Jul 5, 2021
Merged

Rollup of 7 pull requests #86891

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bc45e47
Add std::os::unix::fs::DirEntryExt2::file_name_ref(&self) -> &OsStr
arennow Mar 27, 2021
719dafc
double-check mutability inside Allocation
RalfJung Jun 28, 2021
618c805
Remove alloc/malloc/calloc/realloc doc aliases
Amanieu Jun 30, 2021
fc2705d
Remove "delete" doc aliases
Amanieu Jun 30, 2021
e2536bb
Remove "length" doc aliases
Amanieu Jun 30, 2021
6d34a2e
Stabilize `Seek::rewind`
inquisitivecrystal Jul 1, 2021
a8bb7fa
aborts: Clarify documentation and comments
ijackson May 13, 2021
de19e4d
abort docs: Do not claim that intrinsics::abort is always a debug trap
ijackson May 17, 2021
4e7c348
abort docs: Document buffer non-flushing
ijackson May 17, 2021
44852e0
Talk about invalid instructions rather than debug traps
ijackson Jun 7, 2021
19c347e
Talk about "terminate" rather than "die"
ijackson Jun 7, 2021
f73a555
Use american spelling for behaviour
m-ou-se Jul 5, 2021
08d912f
s/die/terminate/ in abort documentation.
m-ou-se Jul 5, 2021
4fa5406
:arrow_up: rust-analyzer
lnicola Jul 5, 2021
469f467
Enable dir_entry_ext2 feature in doc test.
m-ou-se Jul 5, 2021
6f931da
Remove `impl Clean for {Ident, Symbol}`
jyn514 Jul 5, 2021
1fcd9ab
Rollup merge of #83581 - arennow:dir_entry_ext_unix_borrow_name, r=m-…
JohnTitor Jul 5, 2021
add24d2
Rollup merge of #85377 - ijackson:abort-docs, r=m-ou-se
JohnTitor Jul 5, 2021
1ca3205
Rollup merge of #86685 - RalfJung:alloc-mut, r=oli-obk
JohnTitor Jul 5, 2021
2bc7d4d
Rollup merge of #86794 - inquisitivecrystal:seek-rewind, r=m-ou-se
JohnTitor Jul 5, 2021
470ed70
Rollup merge of #86852 - Amanieu:remove_doc_aliases, r=joshtriplett
JohnTitor Jul 5, 2021
973f208
Rollup merge of #86878 - lnicola:rust-analyzer-2021-07-05, r=lnicola
JohnTitor Jul 5, 2021
952deae
Rollup merge of #86886 - jyn514:no-clean-symbol, r=GuillaumeGomez
JohnTitor Jul 5, 2021
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
Use american spelling for behaviour 
Co-authored-by: Yuki Okushi <jtitor@2k36.org>
  • Loading branch information
@m-ou-se @JohnTitor
m-ou-se and JohnTitor committed Jul 5, 2021
commit f73a555fc9b5def7f444b58eff69965910a662ff
2 changes: 1 addition & 1 deletion library/core/src/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ extern "rust-intrinsic" {
/// any safety invariants.
///
/// [`std::process::abort`](../../std/process/fn.abort.html) is to be preferred if possible,
/// as its behaviour is more user-friendly and more stable.
/// as its behavior is more user-friendly and more stable.
///
/// The current implementation of `intrinsics::abort` is to invoke an invalid instruction,
/// on most platforms.
Expand Down