Skip to content

Commit 6403a2f

Browse files
borsbors
committed
Auto merge of #25462 - alexcrichton:favicon-https, r=nrc
Helps prevent mixed content warnings if accessing docs over HTTPS. Closes #25459
2 parents 5e535ea + 0e21beb commit 6403a2f

File tree

29 files changed

+29
-29
lines changed

29 files changed

+29
-29
lines changed

‎src/liballoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
#![staged_api]
6565
#![crate_type = "rlib"]
6666
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
67-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
67+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
6868
html_root_url = "http://doc.rust-lang.org/nightly/")]
6969
#![doc(test(no_crate_inject))]
7070

‎src/libarena/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#![crate_type = "rlib"]
2828
#![crate_type = "dylib"]
2929
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
30-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
30+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
3131
html_root_url = "http://doc.rust-lang.org/nightly/")]
3232

3333
#![feature(alloc)]

‎src/libcollections/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#![staged_api]
2020
#![crate_type = "rlib"]
2121
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
22-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
22+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2323
html_root_url = "http://doc.rust-lang.org/nightly/",
2424
html_playground_url = "http://play.rust-lang.org/")]
2525
#![doc(test(no_crate_inject))]

‎src/libcore/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#![staged_api]
5454
#![crate_type = "rlib"]
5555
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
56-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
56+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
5757
html_root_url = "http://doc.rust-lang.org/nightly/",
5858
html_playground_url = "http://play.rust-lang.org/")]
5959
#![doc(test(no_crate_inject))]

‎src/libflate/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#![crate_type = "rlib"]
2323
#![crate_type = "dylib"]
2424
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
25-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
25+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2626
html_root_url = "http://doc.rust-lang.org/nightly/")]
2727

2828
#![feature(libc)]

‎src/libfmt_macros/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#![crate_type = "rlib"]
2323
#![crate_type = "dylib"]
2424
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
25-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
25+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2626
html_root_url = "http://doc.rust-lang.org/nightly/",
2727
html_playground_url = "http://play.rust-lang.org/")]
2828

‎src/libgetopts/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
#![crate_type = "rlib"]
8686
#![crate_type = "dylib"]
8787
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
88-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
88+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
8989
html_root_url = "http://doc.rust-lang.org/nightly/",
9090
html_playground_url = "http://play.rust-lang.org/")]
9191

‎src/libgraphviz/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
#![crate_type = "rlib"]
280280
#![crate_type = "dylib"]
281281
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
282-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
282+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
283283
html_root_url = "http://doc.rust-lang.org/nightly/")]
284284
#![feature(collections)]
285285
#![feature(into_cow)]

‎src/liblibc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#![cfg_attr(not(feature = "cargo-build"), staged_api)]
1919
#![cfg_attr(not(feature = "cargo-build"), no_std)]
2020
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
21-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
21+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2222
html_root_url = "http://doc.rust-lang.org/nightly/",
2323
html_playground_url = "http://play.rust-lang.org/")]
2424
#![cfg_attr(test, feature(test))]

‎src/liblog/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
#![crate_type = "rlib"]
165165
#![crate_type = "dylib"]
166166
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
167-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
167+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
168168
html_root_url = "http://doc.rust-lang.org/nightly/",
169169
html_playground_url = "http://play.rust-lang.org/")]
170170
#![deny(missing_docs)]

‎src/librand/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#![crate_name = "rand"]
2222
#![crate_type = "rlib"]
2323
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
24-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
24+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2525
html_root_url = "http://doc.rust-lang.org/nightly/",
2626
html_playground_url = "http://play.rust-lang.org/")]
2727
#![no_std]

‎src/librbml/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
#![crate_type = "rlib"]
120120
#![crate_type = "dylib"]
121121
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
122-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
122+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
123123
html_root_url = "http://doc.rust-lang.org/nightly/",
124124
html_playground_url = "http://play.rust-lang.org/")]
125125

‎src/librustc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#![crate_type = "dylib"]
2323
#![crate_type = "rlib"]
2424
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
25-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
25+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2626
html_root_url = "http://doc.rust-lang.org/nightly/")]
2727

2828
#![feature(associated_consts)]

‎src/librustc_back/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#![crate_type = "dylib"]
3030
#![crate_type = "rlib"]
3131
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
32-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
32+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
3333
html_root_url = "http://doc.rust-lang.org/nightly/")]
3434

3535
#![feature(box_syntax)]

‎src/librustc_borrowck/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![crate_type = "dylib"]
1717
#![crate_type = "rlib"]
1818
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
19-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
19+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2020
html_root_url = "http://doc.rust-lang.org/nightly/")]
2121

2222
#![allow(non_camel_case_types)]

‎src/librustc_driver/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#![crate_type = "dylib"]
2323
#![crate_type = "rlib"]
2424
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
25-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
25+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2626
html_root_url = "http://doc.rust-lang.org/nightly/")]
2727

2828
#![feature(box_syntax)]

‎src/librustc_lint/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#![crate_type = "dylib"]
2828
#![crate_type = "rlib"]
2929
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
30-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
30+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
3131
html_root_url = "http://doc.rust-lang.org/nightly/")]
3232

3333
#![feature(box_patterns)]

‎src/librustc_llvm/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#![crate_type = "dylib"]
2323
#![crate_type = "rlib"]
2424
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
25-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
25+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2626
html_root_url = "http://doc.rust-lang.org/nightly/")]
2727

2828
#![feature(associated_consts)]

‎src/librustc_privacy/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![crate_type = "dylib"]
1717
#![crate_type = "rlib"]
1818
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
19-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
19+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2020
html_root_url = "http://doc.rust-lang.org/nightly/")]
2121

2222
#![feature(rustc_diagnostic_macros)]

‎src/librustc_resolve/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![crate_type = "dylib"]
1717
#![crate_type = "rlib"]
1818
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
19-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
19+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2020
html_root_url = "http://doc.rust-lang.org/nightly/")]
2121

2222
#![feature(alloc)]

‎src/librustc_trans/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#![crate_type = "dylib"]
2323
#![crate_type = "rlib"]
2424
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
25-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
25+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2626
html_root_url = "http://doc.rust-lang.org/nightly/")]
2727

2828
#![feature(alloc)]

‎src/librustc_typeck/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ This API is completely unstable and subject to change.
7070
#![crate_type = "dylib"]
7171
#![crate_type = "rlib"]
7272
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
73-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
73+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
7474
html_root_url = "http://doc.rust-lang.org/nightly/")]
7575

7676
#![allow(non_camel_case_types)]

‎src/librustc_unicode/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#![staged_api]
3030
#![crate_type = "rlib"]
3131
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
32-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
32+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
3333
html_root_url = "http://doc.rust-lang.org/nightly/",
3434
html_playground_url = "http://play.rust-lang.org/")]
3535
#![feature(no_std)]

‎src/librustdoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![crate_type = "dylib"]
1717
#![crate_type = "rlib"]
1818
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
19-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
19+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2020
html_root_url = "http://doc.rust-lang.org/nightly/",
2121
html_playground_url = "http://play.rust-lang.org/")]
2222

‎src/libserialize/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Core encoding and decoding interfaces.
2323
#![crate_type = "rlib"]
2424
#![crate_type = "dylib"]
2525
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
26-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
26+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2727
html_root_url = "http://doc.rust-lang.org/nightly/",
2828
html_playground_url = "http://play.rust-lang.org/")]
2929

‎src/libstd/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
#![crate_type = "rlib"]
9898
#![crate_type = "dylib"]
9999
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
100-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
100+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
101101
html_root_url = "http://doc.rust-lang.org/nightly/",
102102
html_playground_url = "http://play.rust-lang.org/")]
103103
#![doc(test(no_crate_inject, attr(deny(warnings))))]

‎src/libsyntax/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#![crate_type = "dylib"]
2323
#![crate_type = "rlib"]
2424
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
25-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
25+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2626
html_root_url = "http://doc.rust-lang.org/nightly/")]
2727

2828
#![feature(associated_consts)]

‎src/libterm/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#![crate_type = "rlib"]
5151
#![crate_type = "dylib"]
5252
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
53-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
53+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
5454
html_root_url = "http://doc.rust-lang.org/nightly/",
5555
html_playground_url = "http://play.rust-lang.org/")]
5656
#![deny(missing_docs)]

‎src/libtest/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#![crate_type = "rlib"]
3232
#![crate_type = "dylib"]
3333
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
34-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
34+
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
3535
html_root_url = "http://doc.rust-lang.org/nightly/")]
3636

3737
#![feature(asm)]

0 commit comments

Comments
 (0)