Skip to content

Commit 4eeaaa7

Browse files
committedJul 30, 2019
Auto merge of #63124 - Centril:rollup-onohtqt, r=Centril
Rollup of 12 pull requests Successful merges: - #61965 (Remove mentions of removed `offset_to` method from `align_offset` docs) - #62928 (Syntax: Recover on `for ( $pat in $expr ) $block`) - #63000 (Impl Debug for Chars) - #63083 (Make generic parameters always use modern hygiene) - #63087 (Add very simple edition check to tidy.) - #63093 (Properly check the defining scope of existential types) - #63096 (Add tests for some `existential_type` ICEs) - #63099 (vxworks: Remove Linux-specific comments.) - #63106 (ci: Skip installing SWIG/xz on OSX ) - #63108 (Add links to None in Option doc) - #63109 (std: Fix a failing `fs` test on Windows) - #63111 (Add syntactic and semantic tests for rest patterns, i.e. `..`) Failed merges: r? @ghost
2 parents 04b88a9 + 91c10f8 commit 4eeaaa7

Some content is hidden

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

44 files changed

+1042
-247
lines changed
 

‎.azure-pipelines/steps/run.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,6 @@ steps:
6262
- template: install-sccache.yml
6363
- template: install-clang.yml
6464

65-
# Install some dependencies needed to build LLDB/Clang, currently only needed
66-
# during the `dist` target
67-
- bash: |
68-
set -e
69-
brew update
70-
brew install xz
71-
brew install swig@3
72-
brew link --force swig@3
73-
displayName: Install build dependencies (OSX)
74-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'), eq(variables['SCRIPT'],'./x.py dist'))
75-
7665
# Switch to XCode 9.3 on OSX since it seems to be the last version that supports
7766
# i686-apple-darwin. We'll eventually want to upgrade this and it will probably
7867
# force us to drop i686-apple-darwin, but let's keep the wheels turning for now.

‎src/liballoc/tests/str.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,16 @@ fn test_iterator_last() {
11081108
assert_eq!(it.last(), Some('m'));
11091109
}
11101110

1111+
#[test]
1112+
fn test_chars_debug() {
1113+
let s = "ศไทย中华Việt Nam";
1114+
let c = s.chars();
1115+
assert_eq!(
1116+
format!("{:?}", c),
1117+
r#"Chars(['ศ', 'ไ', 'ท', 'ย', '中', '华', 'V', 'i', 'ệ', 't', ' ', 'N', 'a', 'm'])"#
1118+
);
1119+
}
1120+
11111121
#[test]
11121122
fn test_bytesator() {
11131123
let s = "ศไทย中华Việt Nam";

0 commit comments

Comments
 (0)
Please sign in to comment.