Skip to content

Commit 9a239ef

Browse files
committedJul 28, 2019
Auto merge of #63057 - Centril:rollup-z3a3c6v, r=Centril
Rollup of 8 pull requests Successful merges: - #61207 (Allow lifetime elision in `Pin<&(mut) Self>`) - #62074 (squash of all commits for nth_back on ChunksMut) - #62771 (Break dependencies between `syntax_ext` and other crates) - #62883 (Refactoring use common code between option, result and accum) - #62949 (Re-enable assertions in PPC dist builder) - #62996 (tidy: Add a check for inline unit tests) - #63038 (Make more informative error on outer attribute after inner) - #63050 (ci: download awscli from our mirror) Failed merges: r? @ghost
2 parents c798dff + 34c0f46 commit 9a239ef

File tree

89 files changed

+2335
-898
lines changed

Some content is hidden

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

89 files changed

+2335
-898
lines changed
 

‎.azure-pipelines/steps/run.yml

+5-37
Original file line numberDiff line numberDiff line change
@@ -138,43 +138,11 @@ steps:
138138

139139
# Ensure the `aws` CLI is installed so we can deploy later on, cache docker
140140
# images, etc.
141-
- bash: |
142-
set -e
143-
# Temporary code to debug #62967.
144-
debug_failed_connections() {
145-
echo "trying to ping pypi.org"
146-
ping pypi.org -c10 || true
147-
echo "trying to ping google.com"
148-
ping google.com -c10 || true
149-
echo "trying to ping 8.8.8.8"
150-
ping 8.8.8.8 -c10 || true
151-
echo "trying to download pypi.org"
152-
curl https://pypi.org || true
153-
echo "trying to download from our S3 bucket"
154-
curl https://rust-lang-ci2.s3.amazonaws.com || true
155-
echo "trying to dig pypi.org"
156-
dig pypi.org || true
157-
echo "trying to dig files.pythonhosted.org"
158-
dig files.pythonhosted.org || true
159-
echo "trying to connect to pypi.org with openssl"
160-
echo | openssl s_client -connect pypi.org:443 || true
161-
echo "trying to connect to files.pythonhosted.org with openssl"
162-
echo | openssl s_client -connect files.pythonhosted.org:443 || true
163-
}
164-
debug_failed_connections_and_fail() {
165-
debug_failed_connections
166-
return 1
167-
}
168-
source src/ci/shared.sh
169-
sudo apt-get install -y python3-setuptools
170-
debug_failed_connections
171-
retry pip3 install -r src/ci/awscli-requirements.txt --upgrade --user || debug_failed_connections_and_fail
172-
echo "##vso[task.prependpath]$HOME/.local/bin"
173-
displayName: Install awscli (Linux)
174-
condition: and(succeeded(), not(variables.SKIP_JOB), eq(variables['Agent.OS'], 'Linux'))
175-
- script: pip install -r src/ci/awscli-requirements.txt
176-
displayName: Install awscli (non-Linux)
177-
condition: and(succeeded(), not(variables.SKIP_JOB), ne(variables['Agent.OS'], 'Linux'))
141+
- bash: src/ci/install-awscli.sh
142+
env:
143+
AGENT_OS: $(Agent.OS)
144+
condition: and(succeeded(), not(variables.SKIP_JOB))
145+
displayName: Install awscli
178146

179147
# Configure our CI_JOB_NAME variable which log analyzers can use for the main
180148
# step to see what's going on.

‎Cargo.lock

-14
Original file line numberDiff line numberDiff line change
@@ -2863,31 +2863,20 @@ dependencies = [
28632863
name = "rustc_driver"
28642864
version = "0.0.0"
28652865
dependencies = [
2866-
"arena 0.0.0",
28672866
"env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
28682867
"graphviz 0.0.0",
28692868
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
28702869
"rustc 0.0.0",
2871-
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
28722870
"rustc_ast_borrowck 0.0.0",
28732871
"rustc_codegen_utils 0.0.0",
28742872
"rustc_data_structures 0.0.0",
28752873
"rustc_errors 0.0.0",
2876-
"rustc_incremental 0.0.0",
28772874
"rustc_interface 0.0.0",
2878-
"rustc_lint 0.0.0",
28792875
"rustc_metadata 0.0.0",
28802876
"rustc_mir 0.0.0",
2881-
"rustc_passes 0.0.0",
2882-
"rustc_plugin 0.0.0",
2883-
"rustc_privacy 0.0.0",
2884-
"rustc_resolve 0.0.0",
28852877
"rustc_save_analysis 0.0.0",
28862878
"rustc_target 0.0.0",
2887-
"rustc_traits 0.0.0",
2888-
"rustc_typeck 0.0.0",
28892879
"serialize 0.0.0",
2890-
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
28912880
"syntax 0.0.0",
28922881
"syntax_pos 0.0.0",
28932882
]
@@ -3019,7 +3008,6 @@ dependencies = [
30193008
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
30203009
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
30213010
"syntax 0.0.0",
3022-
"syntax_ext 0.0.0",
30233011
"syntax_pos 0.0.0",
30243012
]
30253013

@@ -3064,9 +3052,7 @@ dependencies = [
30643052
"rustc 0.0.0",
30653053
"rustc_data_structures 0.0.0",
30663054
"rustc_errors 0.0.0",
3067-
"rustc_mir 0.0.0",
30683055
"syntax 0.0.0",
3069-
"syntax_ext 0.0.0",
30703056
"syntax_pos 0.0.0",
30713057
]
30723058

0 commit comments

Comments
 (0)