Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6d57e66

Browse files
committedMay 20, 2019
Auto merge of #59445 - alexreg:ban-multi-trait-objects-via-aliases, r=oli-obk
Ban multi-trait objects via trait aliases Obviously, multi-trait objects are not normally supported, so they should not be supported via trait aliases. This has been factored out from the previous PR #55994 (see point 1). r? @Centril CC @nikomatsakis
2 parents d35181a + ce2ee30 commit 6d57e66

Some content is hidden

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

57 files changed

+2032
-294
lines changed
 

‎src/liballoc/slice.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ pub use core::slice::{RChunks, RChunksMut, RChunksExact, RChunksExactMut};
123123
////////////////////////////////////////////////////////////////////////////////
124124

125125
// HACK(japaric) needed for the implementation of `vec!` macro during testing
126-
// NB see the hack module in this file for more details
126+
// N.B., see the `hack` module in this file for more details.
127127
#[cfg(test)]
128128
pub use hack::into_vec;
129129

130130
// HACK(japaric) needed for the implementation of `Vec::clone` during testing
131-
// NB see the hack module in this file for more details
131+
// N.B., see the `hack` module in this file for more details.
132132
#[cfg(test)]
133133
pub use hack::to_vec;
134134

@@ -376,7 +376,7 @@ impl<T> [T] {
376376
pub fn to_vec(&self) -> Vec<T>
377377
where T: Clone
378378
{
379-
// NB see hack module in this file
379+
// N.B., see the `hack` module in this file for more details.
380380
hack::to_vec(self)
381381
}
382382

@@ -397,7 +397,7 @@ impl<T> [T] {
397397
#[stable(feature = "rust1", since = "1.0.0")]
398398
#[inline]
399399
pub fn into_vec(self: Box<Self>) -> Vec<T> {
400-
// NB see hack module in this file
400+
// N.B., see the `hack` module in this file for more details.
401401
hack::into_vec(self)
402402
}
403403

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ impl<'hir> Map<'hir> {
957957
}
958958
}
959959

960-
/// Returns the name associated with the given NodeId's AST.
960+
/// Returns the name associated with the given `NodeId`'s AST.
961961
pub fn name(&self, id: NodeId) -> Name {
962962
let hir_id = self.node_to_hir_id(id);
963963
self.name_by_hir_id(hir_id)

0 commit comments

Comments
 (0)
Please sign in to comment.