Skip to content

Commit f943349

Browse files
committed
Auto merge of #69804 - Centril:rollup-u86dc1g, r=Centril
Rollup of 8 pull requests Successful merges: - #69667 (Remove the `no_debug` feature) - #69687 (resolve, inconsistent binding mode: tweak wording) - #69708 (On mismatched delimiters, only point at empty blocks that are in the same line) - #69765 (reduce test size for Miri) - #69773 (fix various typos) - #69787 (mir::Local is Copy we can pass it by value in these cases) - #69794 (Add `Layout::dangling()` to return a well-aligned `NonNull<u8>`) - #69797 (Correct version that relaxed orphan rules) Failed merges: r? @ghost
2 parents 823ff8c + 8ee7278 commit f943349

File tree

153 files changed

+286
-382
lines changed

Some content is hidden

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

153 files changed

+286
-382
lines changed

config.toml.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
# `0` - no debug info
316316
# `1` - line tables only
317317
# `2` - full debug info with variable and type information
318-
# Can be overriden for specific subsets of Rust code (rustc, std or tools).
318+
# Can be overridden for specific subsets of Rust code (rustc, std or tools).
319319
# Debuginfo for tests run with compiletest is not controlled by this option
320320
# and needs to be enabled separately with `debuginfo-level-tests`.
321321
#debuginfo-level = if debug { 2 } else { 0 }

src/bootstrap/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fn copy_third_party_objects(
141141
copy_and_stamp(&srcdir, "crt1.o");
142142
}
143143

144-
// Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx.
144+
// Copies libunwind.a compiled to be linked with x86_64-fortanix-unknown-sgx.
145145
//
146146
// This target needs to be linked to Fortanix's port of llvm's libunwind.
147147
// libunwind requires support for rwlock and printing to stderr,

src/bootstrap/flags.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub struct Flags {
3333
pub rustc_error_format: Option<String>,
3434
pub dry_run: bool,
3535

36-
// This overrides the deny-warnings configuation option,
36+
// This overrides the deny-warnings configuration option,
3737
// which passes -Dwarnings to the compiler invocations.
3838
//
3939
// true => deny, false => warn

src/ci/azure-pipelines/try.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
# The macOS and Windows builds here are currently disabled due to them not being
2222
# overly necessary on `try` builds. We also don't actually have anything that
23-
# consumes the artifacts currently. Perhaps one day we can reenable, but for now
23+
# consumes the artifacts currently. Perhaps one day we can re-enable, but for now
2424
# it helps free up capacity on Azure.
2525
# - job: macOS
2626
# timeoutInMinutes: 600

src/doc/rustdoc/src/unstable-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ override `ignore`.
453453

454454
### `--runtool`, `--runtool-arg`: program to run tests with; args to pass to it
455455

456-
Using thses options looks like this:
456+
Using these options looks like this:
457457

458458
```bash
459459
$ rustdoc src/lib.rs -Z unstable-options --runtool runner --runtool-arg --do-thing --runtool-arg --do-other-thing

src/doc/unstable-book/src/language-features/marker-trait-attr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ when they'd need to do the same thing for every type anyway).
2121

2222
impl<T: Copy> CheapToClone for T {}
2323

24-
// These could potentally overlap with the blanket implementation above,
24+
// These could potentially overlap with the blanket implementation above,
2525
// so are only allowed because CheapToClone is a marker trait.
2626
impl<T: CheapToClone, U: CheapToClone> CheapToClone for (T, U) {}
2727
impl<T: CheapToClone> CheapToClone for std::ops::Range<T> {}

src/liballoc/collections/btree/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ impl<K, V> Root<K, V> {
306306
/// `NodeRef` could be pointing to either type of node.
307307
/// Note that in case of a leaf node, this might still be the shared root!
308308
/// Only turn this into a `LeafNode` reference if you know it is not the shared root!
309-
/// Shared references must be dereferencable *for the entire size of their pointee*,
309+
/// Shared references must be dereferenceable *for the entire size of their pointee*,
310310
/// so '&LeafNode` or `&InternalNode` pointing to the shared root is undefined behavior.
311311
/// Turning this into a `NodeHeader` reference is always safe.
312312
pub struct NodeRef<BorrowType, K, V, Type> {

src/liballoc/collections/linked_list.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -841,10 +841,10 @@ impl<T> LinkedList<T> {
841841
/// d.push_front(2);
842842
/// d.push_front(3);
843843
///
844-
/// let mut splitted = d.split_off(2);
844+
/// let mut split = d.split_off(2);
845845
///
846-
/// assert_eq!(splitted.pop_front(), Some(1));
847-
/// assert_eq!(splitted.pop_front(), None);
846+
/// assert_eq!(split.pop_front(), Some(1));
847+
/// assert_eq!(split.pop_front(), None);
848848
/// ```
849849
#[stable(feature = "rust1", since = "1.0.0")]
850850
pub fn split_off(&mut self, at: usize) -> LinkedList<T> {

src/liballoc/collections/vec_deque.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2132,7 +2132,7 @@ impl<T> VecDeque<T> {
21322132
// Safety: the following two methods require that the rotation amount
21332133
// be less than half the length of the deque.
21342134
//
2135-
// `wrap_copy` requres that `min(x, cap() - x) + copy_len <= cap()`,
2135+
// `wrap_copy` requires that `min(x, cap() - x) + copy_len <= cap()`,
21362136
// but than `min` is never more than half the capacity, regardless of x,
21372137
// so it's sound to call here because we're calling with something
21382138
// less than half the length, which is never above half the capacity.

src/liballoc/tests/slice.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,9 +1733,9 @@ fn panic_safe() {
17331733
let moduli = &[5, 20, 50];
17341734

17351735
#[cfg(miri)]
1736-
let lens = 1..13;
1736+
let lens = 1..10;
17371737
#[cfg(miri)]
1738-
let moduli = &[10];
1738+
let moduli = &[5];
17391739

17401740
for len in lens {
17411741
for &modulus in moduli {

0 commit comments

Comments
 (0)