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 cd3d580

Browse files
committedJan 24, 2019
Auto merge of #57869 - Centril:rollup, r=Centril
Rollup of 11 pull requests Successful merges: - #57179 (Update std/lib.rs docs to reflect Rust 2018 usage) - #57730 (Merge visitors in AST validation) - #57779 (Recover from parse errors in literal struct fields and incorrect float literals) - #57793 (Explain type mismatch cause pointing to return type when it is `impl Trait`) - #57795 (Use structured suggestion in stead of notes) - #57817 (Add error for trailing angle brackets.) - #57834 (Stabilize Any::get_type_id and rename to type_id) - #57836 (Fix some cross crate existential type ICEs) - #57840 (Fix issue 57762) - #57844 (use port 80 for retrieving GPG key) - #57858 (Ignore line ending on older git versions) Failed merges: r? @ghost
2 parents 19f8958 + e90cdfd commit cd3d580

Some content is hidden

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

47 files changed

+840
-310
lines changed
 

‎.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ src/etc/installer/gfx/* binary
99
*.woff binary
1010
src/vendor/** -text
1111
Cargo.lock -merge linguist-generated=false
12+
13+
# Older git versions try to fix line endings on images, this prevents it.
14+
*.png binary
15+
*.ico binary

‎src/ci/docker/dist-various-1/install-x86_64-redox.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -ex
66
apt-get update
77
apt-get install -y --no-install-recommends software-properties-common apt-transport-https
88

9-
apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F
9+
apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA12E97F0881517F
1010
add-apt-repository -y 'deb https://static.redox-os.org/toolchain/apt /'
1111

1212
apt-get update

0 commit comments

Comments
 (0)
Please sign in to comment.