Skip to content

Commit 3a4612d

Browse files
borsbors
committed
Auto merge of rust-lang#114197 - matthiaskrgr:rollup-iluf7u4, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#113773 (Don't attempt to compute layout of type referencing error) - rust-lang#114107 (Prevent people from assigning me as a PR reviewer) - rust-lang#114124 (tests/ui/proc-macro/*: Migrate FIXMEs to check-pass) - rust-lang#114171 (Fix switch-stdout test for none unix/windows platforms) - rust-lang#114172 (Fix issue_15149 test for the SGX target) - rust-lang#114173 (btree/map.rs: remove "Basic usage" text) - rust-lang#114174 (doc: replace wrong punctuation mark) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 84f9a8f + d6fc49c commit 3a4612d

File tree

4 files changed

+4
-56
lines changed

4 files changed

+4
-56
lines changed

‎alloc/src/collections/btree/map.rs‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,6 @@ impl<K, V> BTreeMap<K, V> {
613613
///
614614
/// # Examples
615615
///
616-
/// Basic usage:
617-
///
618616
/// ```
619617
/// use std::collections::BTreeMap;
620618
///
@@ -636,8 +634,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
636634
///
637635
/// # Examples
638636
///
639-
/// Basic usage:
640-
///
641637
/// ```
642638
/// use std::collections::BTreeMap;
643639
///
@@ -661,8 +657,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
661657
///
662658
/// # Examples
663659
///
664-
/// Basic usage:
665-
///
666660
/// ```
667661
/// # #![feature(allocator_api)]
668662
/// # #![feature(btreemap_alloc)]
@@ -688,8 +682,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
688682
///
689683
/// # Examples
690684
///
691-
/// Basic usage:
692-
///
693685
/// ```
694686
/// use std::collections::BTreeMap;
695687
///
@@ -744,8 +736,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
744736
///
745737
/// # Examples
746738
///
747-
/// Basic usage:
748-
///
749739
/// ```
750740
/// use std::collections::BTreeMap;
751741
///
@@ -830,8 +820,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
830820
///
831821
/// # Examples
832822
///
833-
/// Basic usage:
834-
///
835823
/// ```
836824
/// use std::collections::BTreeMap;
837825
///
@@ -917,8 +905,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
917905
///
918906
/// # Examples
919907
///
920-
/// Basic usage:
921-
///
922908
/// ```
923909
/// use std::collections::BTreeMap;
924910
///
@@ -943,8 +929,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
943929
///
944930
/// # Examples
945931
///
946-
/// Basic usage:
947-
///
948932
/// ```
949933
/// use std::collections::BTreeMap;
950934
///
@@ -982,8 +966,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
982966
///
983967
/// # Examples
984968
///
985-
/// Basic usage:
986-
///
987969
/// ```
988970
/// use std::collections::BTreeMap;
989971
///
@@ -1017,8 +999,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
1017999
///
10181000
/// # Examples
10191001
///
1020-
/// Basic usage:
1021-
///
10221002
/// ```
10231003
/// #![feature(map_try_insert)]
10241004
///
@@ -1051,8 +1031,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
10511031
///
10521032
/// # Examples
10531033
///
1054-
/// Basic usage:
1055-
///
10561034
/// ```
10571035
/// use std::collections::BTreeMap;
10581036
///
@@ -1078,8 +1056,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
10781056
///
10791057
/// # Examples
10801058
///
1081-
/// Basic usage:
1082-
///
10831059
/// ```
10841060
/// use std::collections::BTreeMap;
10851061
///
@@ -1208,8 +1184,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
12081184
///
12091185
/// # Examples
12101186
///
1211-
/// Basic usage:
1212-
///
12131187
/// ```
12141188
/// use std::collections::BTreeMap;
12151189
/// use std::ops::Bound::Included;
@@ -1251,8 +1225,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
12511225
///
12521226
/// # Examples
12531227
///
1254-
/// Basic usage:
1255-
///
12561228
/// ```
12571229
/// use std::collections::BTreeMap;
12581230
///
@@ -1283,8 +1255,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
12831255
///
12841256
/// # Examples
12851257
///
1286-
/// Basic usage:
1287-
///
12881258
/// ```
12891259
/// use std::collections::BTreeMap;
12901260
///
@@ -1336,8 +1306,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
13361306
///
13371307
/// # Examples
13381308
///
1339-
/// Basic usage:
1340-
///
13411309
/// ```
13421310
/// use std::collections::BTreeMap;
13431311
///
@@ -2388,8 +2356,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
23882356
///
23892357
/// # Examples
23902358
///
2391-
/// Basic usage:
2392-
///
23932359
/// ```
23942360
/// use std::collections::BTreeMap;
23952361
///
@@ -2420,8 +2386,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
24202386
///
24212387
/// # Examples
24222388
///
2423-
/// Basic usage:
2424-
///
24252389
/// ```
24262390
/// use std::collections::BTreeMap;
24272391
///
@@ -2453,8 +2417,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
24532417
///
24542418
/// # Examples
24552419
///
2456-
/// Basic usage:
2457-
///
24582420
/// ```
24592421
/// use std::collections::BTreeMap;
24602422
///
@@ -2474,8 +2436,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
24742436
///
24752437
/// # Examples
24762438
///
2477-
/// Basic usage:
2478-
///
24792439
/// ```
24802440
/// use std::collections::BTreeMap;
24812441
///
@@ -2495,8 +2455,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
24952455
///
24962456
/// # Examples
24972457
///
2498-
/// Basic usage:
2499-
///
25002458
/// ```
25012459
/// use std::collections::BTreeMap;
25022460
///
@@ -2521,8 +2479,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
25212479
///
25222480
/// # Examples
25232481
///
2524-
/// Basic usage:
2525-
///
25262482
/// ```
25272483
/// use std::collections::BTreeMap;
25282484
///
@@ -2546,8 +2502,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
25462502
///
25472503
/// # Examples
25482504
///
2549-
/// Basic usage:
2550-
///
25512505
/// ```
25522506
/// use std::collections::BTreeMap;
25532507
///
@@ -2578,8 +2532,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
25782532
///
25792533
/// # Examples
25802534
///
2581-
/// Basic usage:
2582-
///
25832535
/// ```
25842536
/// #![feature(btree_cursors)]
25852537
///
@@ -2619,8 +2571,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
26192571
///
26202572
/// # Examples
26212573
///
2622-
/// Basic usage:
2623-
///
26242574
/// ```
26252575
/// #![feature(btree_cursors)]
26262576
///
@@ -2673,8 +2623,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
26732623
///
26742624
/// # Examples
26752625
///
2676-
/// Basic usage:
2677-
///
26782626
/// ```
26792627
/// #![feature(btree_cursors)]
26802628
///
@@ -2714,8 +2662,6 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
27142662
///
27152663
/// # Examples
27162664
///
2717-
/// Basic usage:
2718-
///
27192665
/// ```
27202666
/// #![feature(btree_cursors)]
27212667
///

‎core/src/borrow.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/// Types express that they can be borrowed as some type `T` by implementing
2323
/// `Borrow<T>`, providing a reference to a `T` in the trait’s
2424
/// [`borrow`] method. A type is free to borrow as several different types.
25-
/// If it wishes to mutably borrow as the type – allowing the underlying data
25+
/// If it wishes to mutably borrow as the type, allowing the underlying data
2626
/// to be modified, it can additionally implement [`BorrowMut<T>`].
2727
///
2828
/// Further, when providing implementations for additional traits, it needs

‎std/tests/process_spawning.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![cfg(not(target_env="sgx"))]
2+
13
use std::env;
24
use std::fs;
35
use std::process;

‎std/tests/switch-stdout.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#[cfg(any(target_family = "unix", target_family = "windows"))]
1+
#![cfg(any(target_family = "unix", target_family = "windows"))]
22

33
use std::fs::File;
44
use std::io::{Read, Write};

0 commit comments

Comments
 (0)