Skip to content

Commit b3475de

Browse files
committed
Auto merge of #61379 - Centril:rollup-hx912ts, r=Centril
Rollup of 10 pull requests Successful merges: - #60897 (error: remove StringError from Debug output) - #61278 (Miri: give machine the chance to tag all allocations) - #61304 (Speed up Azure CI installing Windows dependencies) - #61342 (Set ellipsis_inclusive_range_patterns lint to warn) - #61344 (Add regression test for const generics ICE) - #61359 (Fix links in Deref documentation) - #61363 (Stabilize iter_nth_back feature) - #61369 (Fixed lifetime misspelling) - #61372 (Migrate some books to mdbook version 0.2) - #61374 (Explicitly suggest 'type_ascription' feature) Failed merges: r? @ghost
2 parents 3ade426 + 4254c25 commit b3475de

Some content is hidden

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

56 files changed

+403
-313
lines changed

.azure-pipelines/steps/install-clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ steps:
2727
# Original downloaded here came from
2828
# http://releases.llvm.org/7.0.0/LLVM-7.0.0-win64.exe
2929
- script: |
30-
powershell -Command "iwr -outf %TEMP%\LLVM-7.0.0-win64.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.exe"
30+
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf %TEMP%\LLVM-7.0.0-win64.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.exe"
3131
set CLANG_DIR=%CD%\citools\clang-rust
3232
%TEMP%\LLVM-7.0.0-win64.exe /S /NCRC /D=%CLANG_DIR%
3333
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=%CLANG_DIR%\bin\clang-cl.exe

.azure-pipelines/steps/install-sccache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ steps:
99

1010
- script: |
1111
md sccache
12-
powershell -Command "iwr -outf sccache\sccache.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc"
12+
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf sccache\sccache.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc"
1313
echo ##vso[task.prependpath]%CD%\sccache
1414
displayName: Install sccache (Windows)
1515
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

.azure-pipelines/steps/install-windows-build-deps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ steps:
5454
# Note that we don't literally overwrite the gdb.exe binary because it appears
5555
# to just use gdborig.exe, so that's the binary we deal with instead.
5656
- script: |
57-
powershell -Command "iwr -outf %MINGW_ARCHIVE% %MINGW_URL%/%MINGW_ARCHIVE%"
57+
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf %MINGW_ARCHIVE% %MINGW_URL%/%MINGW_ARCHIVE%"
5858
7z x -y %MINGW_ARCHIVE% > nul
59-
powershell -Command "iwr -outf 2017-04-20-%MSYS_BITS%bit-gdborig.exe %MINGW_URL%/2017-04-20-%MSYS_BITS%bit-gdborig.exe"
59+
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf 2017-04-20-%MSYS_BITS%bit-gdborig.exe %MINGW_URL%/2017-04-20-%MSYS_BITS%bit-gdborig.exe"
6060
mv 2017-04-20-%MSYS_BITS%bit-gdborig.exe %MINGW_DIR%\bin\gdborig.exe
6161
echo ##vso[task.prependpath]%CD%\%MINGW_DIR%\bin
6262
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), ne(variables['MINGW_URL'],''))
@@ -81,7 +81,7 @@ steps:
8181
# Note that this is originally from the github releases patch of Ninja
8282
- script: |
8383
md ninja
84-
powershell -Command "iwr -outf 2017-03-15-ninja-win.zip https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-03-15-ninja-win.zip"
84+
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf 2017-03-15-ninja-win.zip https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-03-15-ninja-win.zip"
8585
7z x -oninja 2017-03-15-ninja-win.zip
8686
del 2017-03-15-ninja-win.zip
8787
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja

src/bootstrap/doc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ macro_rules! book {
6262
book!(
6363
EditionGuide, "src/doc/edition-guide", "edition-guide", RustbookVersion::MdBook2;
6464
EmbeddedBook, "src/doc/embedded-book", "embedded-book", RustbookVersion::MdBook2;
65-
Nomicon, "src/doc/nomicon", "nomicon", RustbookVersion::MdBook1;
65+
Nomicon, "src/doc/nomicon", "nomicon", RustbookVersion::MdBook2;
6666
Reference, "src/doc/reference", "reference", RustbookVersion::MdBook1;
6767
RustByExample, "src/doc/rust-by-example", "rust-by-example", RustbookVersion::MdBook1;
6868
RustcBook, "src/doc/rustc", "rustc", RustbookVersion::MdBook1;
69-
RustdocBook, "src/doc/rustdoc", "rustdoc", RustbookVersion::MdBook1;
69+
RustdocBook, "src/doc/rustdoc", "rustdoc", RustbookVersion::MdBook2;
7070
);
7171

7272
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
@@ -134,7 +134,7 @@ impl Step for UnstableBook {
134134
target: self.target,
135135
name: INTERNER.intern_str("unstable-book"),
136136
src: builder.md_doc_out(self.target),
137-
version: RustbookVersion::MdBook1,
137+
version: RustbookVersion::MdBook2,
138138
})
139139
}
140140
}

src/doc/rustdoc/src/command-line-arguments.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ $ rustdoc src/lib.rs --passes strip-priv-imports
178178
An argument of "list" will print a list of possible "rustdoc passes", and other
179179
arguments will be the name of which passes to run in addition to the defaults.
180180

181-
For more details on passes, see [the chapter on them](passes.html).
181+
For more details on passes, see [the chapter on them](passes.md).
182182

183183
See also `--no-defaults`.
184184

@@ -194,7 +194,7 @@ By default, `rustdoc` will run several passes over your code. This
194194
removes those defaults, allowing you to use `--passes` to specify
195195
exactly which passes you want.
196196

197-
For more details on passes, see [the chapter on them](passes.html).
197+
For more details on passes, see [the chapter on them](passes.md).
198198

199199
See also `--passes`.
200200

@@ -207,7 +207,7 @@ $ rustdoc src/lib.rs --test
207207
```
208208

209209
This flag will run your code examples as tests. For more, see [the chapter
210-
on documentation tests](documentation-tests.html).
210+
on documentation tests](documentation-tests.md).
211211

212212
See also `--test-args`.
213213

@@ -220,7 +220,7 @@ $ rustdoc src/lib.rs --test --test-args ignored
220220
```
221221

222222
This flag will pass options to the test runner when running documentation tests.
223-
For more, see [the chapter on documentation tests](documentation-tests.html).
223+
For more, see [the chapter on documentation tests](documentation-tests.md).
224224

225225
See also `--test`.
226226

src/doc/rustdoc/src/passes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Rustdoc has a concept called "passes". These are transformations that
55

66
In addition to the passes below, check out the docs for these flags:
77

8-
* [`--passes`](command-line-arguments.html#a--passes-add-more-rustdoc-passes)
9-
* [`--no-defaults`](command-line-arguments.html#a--no-defaults-dont-run-default-passes)
8+
* [`--passes`](command-line-arguments.md#--passes-add-more-rustdoc-passes)
9+
* [`--no-defaults`](command-line-arguments.md#--no-defaults-dont-run-default-passes)
1010

1111
## Default passes
1212

src/doc/unstable-book/src/language-features/asm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,4 @@ constraints, etc.
190190
[llvm-docs]: http://llvm.org/docs/LangRef.html#inline-assembler-expressions
191191

192192
If you need more power and don't mind losing some of the niceties of
193-
`asm!`, check out [global_asm](language-features/global-asm.html).
193+
`asm!`, check out [global_asm](global-asm.md).

src/doc/unstable-book/src/language-features/box-patterns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The tracking issue for this feature is: [#29641]
44

55
[#29641]: https://github.com/rust-lang/rust/issues/29641
66

7-
See also [`box_syntax`](language-features/box-syntax.html)
7+
See also [`box_syntax`](box-syntax.md)
88

99
------------------------
1010

src/doc/unstable-book/src/language-features/box-syntax.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The tracking issue for this feature is: [#49733]
44

55
[#49733]: https://github.com/rust-lang/rust/issues/49733
66

7-
See also [`box_patterns`](language-features/box-patterns.html)
7+
See also [`box_patterns`](box-patterns.md)
88

99
------------------------
1010

src/doc/unstable-book/src/language-features/global-asm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ usages and placed the larger, single usage in the crate root.
7575
If you don't need quite as much power and flexibility as
7676
`global_asm!` provides, and you don't mind restricting your inline
7777
assembly to `fn` bodies only, you might try the
78-
[asm](language-features/asm.html) feature instead.
78+
[asm](asm.md) feature instead.

0 commit comments

Comments
 (0)