Skip to content

Rollup of 12 pull requests #89847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Oct 13, 2021
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e71d17b
Edit explanation of test for nested type ascriptions
pierwill Oct 11, 2021
e56d89a
Add missing words in `Infallible` docs
Wilfred Oct 11, 2021
d2564ce
rustdoc: update noto sans kr
Oct 11, 2021
0cf84c8
Add #[must_use] to to_value conversions
jkugelman Oct 11, 2021
0767ed3
add some more testcases
hellow554 Oct 11, 2021
7943c9c
Use Option::map_or instead of open coding it
LingMan Oct 12, 2021
81eeb3e
Fix uppercase/lowercase error
jkugelman Oct 12, 2021
e5cfe84
Fix invalid rules in .gitignore
Canop Oct 12, 2021
a6bb1fb
Add #[inline] to int log10 functions.
m-ou-se Oct 12, 2021
7a646df
Add missing entries for overflow-checks to config.toml.example.
hkratz Oct 11, 2021
cfc7782
Add --enable-overflow-checks-std option to configure script.
hkratz Oct 11, 2021
bcf7cf6
Add --enable-debug-assertions-std option to configure script.
hkratz Oct 12, 2021
905ed5f
Make `rust.overflow-checks-std`option default to `rust.overflow-checks`.
hkratz Oct 12, 2021
4b4d3ee
fix the stage0 tools config file path in config.toml.example
wangkirin Oct 13, 2021
646bc1d
Add davidtwco to the `.mailmap`
davidtwco Oct 13, 2021
0caa616
Rollup merge of #89768 - hellow554:tests, r=Mark-Simulacrum
JohnTitor Oct 13, 2021
cd5fe93
Rollup merge of #89777 - pierwill:fix-88233, r=Mark-Simulacrum
JohnTitor Oct 13, 2021
f759fff
Rollup merge of #89781 - Wilfred:patch-2, r=JohnTitor
JohnTitor Oct 13, 2021
cabfda4
Rollup merge of #89782 - konan8205:develop, r=jsha
JohnTitor Oct 13, 2021
c1bde6e
Rollup merge of #89794 - jkugelman:must-use-to_value-conversions, r=j…
JohnTitor Oct 13, 2021
06e4aee
Rollup merge of #89814 - jkugelman:must-use-string-transforms-typo, r…
JohnTitor Oct 13, 2021
7948883
Rollup merge of #89816 - Canop:master, r=Mark-Simulacrum
JohnTitor Oct 13, 2021
59ebfdd
Rollup merge of #89817 - m-ou-se:int-log-10-inline, r=the8472
JohnTitor Oct 13, 2021
6eb0a5f
Rollup merge of #89818 - LingMan:map_or, r=oli-obk
JohnTitor Oct 13, 2021
72626bf
Rollup merge of #89828 - rusticstuff:overflow-check-options-take-two,…
JohnTitor Oct 13, 2021
d01cfe1
Rollup merge of #89840 - wangkirin:master, r=jyn514
JohnTitor Oct 13, 2021
e21f892
Rollup merge of #89845 - davidtwco:davidtwco-mailmap, r=oli-obk
JohnTitor Oct 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix the stage0 tools config file path in config.toml.example
  • Loading branch information
wangkirin committed Oct 13, 2021
commit 4b4d3ee60b6602d2f32f02f170f531b5df15f127
6 changes: 3 additions & 3 deletions config.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,15 @@ changelog-seen = 2
# You can use "$ROOT" to indicate the root of the git repository.
#build-dir = "build"

# Instead of downloading the src/stage0.txt version of Cargo specified, use
# Instead of downloading the src/stage0.json version of Cargo specified, use
# this Cargo binary instead to build all Rust code
#cargo = "/path/to/cargo"

# Instead of downloading the src/stage0.txt version of the compiler
# Instead of downloading the src/stage0.json version of the compiler
# specified, use this rustc binary instead as the stage0 snapshot compiler.
#rustc = "/path/to/rustc"

# Instead of download the src/stage0.txt version of rustfmt specified,
# Instead of download the src/stage0.json version of rustfmt specified,
# use this rustfmt binary instead as the stage0 snapshot rustfmt.
#rustfmt = "/path/to/rustfmt"

Expand Down