Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
a7bd6c4
Link to "Contributing to Rust" rather than "Getting Started".
follower Sep 27, 2020
a93f58f
Join map operators
wcampbell0x2a Oct 13, 2020
964a5ac
Use is_ok() instead of empty Ok(_)
wcampbell0x2a Oct 13, 2020
abfbd1b
Avoid extraneous space between visibility kw and ident for statics
ayazhafiz Oct 13, 2020
e60072f
fixup! Avoid extraneous space between visibility kw and ident for sta…
ayazhafiz Oct 13, 2020
000ec5e
Made slice sort documentation consistent between stable and unstable …
ryan-scott-dev Oct 14, 2020
8446d94
Following #74010 by converting some newer cases of backticked O notat…
ryan-scott-dev Oct 14, 2020
3b37d94
Add some tests
Nadrieril Oct 17, 2020
bb81110
Destructure byte array constants to array patterns instead of keeping…
oli-obk Sep 29, 2020
c3d0445
Destructure byte slices and remove all the workarounds
oli-obk Oct 1, 2020
99852e0
A ConstantValue constructor with a slice pattern is an error
Nadrieril Oct 17, 2020
3708c86
Treat booleans as integers with valid range 0..=1
oli-obk Oct 2, 2020
f504e9a
Fix comment
Nadrieril Oct 17, 2020
aa41720
Handle ranges of float consistently
Nadrieril Oct 17, 2020
d1a784e
Treat string literals separately from other constants
Nadrieril Oct 17, 2020
da0ba2f
The only remaining constant patterns are opaque
Nadrieril Oct 18, 2020
c4ae6c2
Add comment
Nadrieril Oct 18, 2020
2780e35
Throw core::panic!("message") as &str instead of String.
m-ou-se Oct 19, 2020
9890217
Fix ui test for updated core::panic behaviour.
m-ou-se Oct 19, 2020
d80f127
Avoid panic_bounds_check in fmt::write.
m-ou-se Oct 19, 2020
5bfd3e7
Accidentally fixed #78071
Nadrieril Oct 19, 2020
ea24395
Add debug_asserts for the unsafe indexing in fmt::write.
m-ou-se Oct 20, 2020
5948e62
Sync LLVM submodule if it has been initialized
est31 Oct 20, 2020
356d5b5
Add test to check for fmt::write bloat.
m-ou-se Oct 20, 2020
52640f2
[mir-opt] Allow debuginfo to be generated for a constant or a Place
wesleywiser May 30, 2020
3519411
Add a test for #53708
Nadrieril Oct 21, 2020
faf8710
Explain the `Opaque` special case in specialization
Nadrieril Oct 21, 2020
484d9eb
Move fmt-write-bloat test to run-make-fulldeps.
m-ou-se Oct 21, 2020
e0b6111
Mark `repr128` as `incomplete_features`
varkor Oct 3, 2020
683db31
Fix clippy tests
varkor Oct 22, 2020
954b5a8
Rename parse_const_expr to parse_const_block
spastorino Oct 20, 2020
f8842b9
Make inline const work in range patterns
spastorino Oct 19, 2020
83abed9
Make inline const work for half open ranges
spastorino Oct 19, 2020
5bef429
Add ..= const { .. } missing tests and sort them properly
spastorino Oct 20, 2020
5656a41
Bless tests
spastorino Oct 20, 2020
4f7ffbf
Fix const core::panic!(non_literal_str).
m-ou-se Sep 5, 2020
7130127
Add test for const panic!(CONST).
m-ou-se Oct 18, 2020
d7695cb
Rollup merge of #73210 - wesleywiser:consts_in_debuginfo, r=oli-obk
Dylan-DPC Oct 22, 2020
ff817fa
Rollup merge of #77268 - follower:patch-3, r=jyn514
Dylan-DPC Oct 22, 2020
84b134c
Rollup merge of #77488 - varkor:repr128-incomplete_features, r=jonas-…
Dylan-DPC Oct 22, 2020
23aff01
Rollup merge of #77918 - wcampbell0x2a:cleanup-network-tests, r=m-ou-se
Dylan-DPC Oct 22, 2020
2f6a53f
Rollup merge of #77920 - ayazhafiz:i/mut-ident-spacing, r=jyn514
Dylan-DPC Oct 22, 2020
c09b7e3
Rollup merge of #77969 - ryan-scott-dev:bigo-notation-consistency, r=…
Dylan-DPC Oct 22, 2020
dc30e64
Rollup merge of #78069 - fusion-engineering-forks:core-const-panic-st…
Dylan-DPC Oct 22, 2020
f4780a9
Rollup merge of #78072 - Nadrieril:cleanup-constant-matching, r=varkor
Dylan-DPC Oct 22, 2020
84f1f54
Rollup merge of #78116 - spastorino:inline-const-in-range-pat, r=petr…
Dylan-DPC Oct 22, 2020
76bcc7c
Rollup merge of #78119 - fusion-engineering-forks:panic-use-as-str, r…
Dylan-DPC Oct 22, 2020
4914ef8
Rollup merge of #78122 - fusion-engineering-forks:fmt-write-bounds-ch…
Dylan-DPC Oct 22, 2020
e4dc50e
Rollup merge of #78153 - est31:downloaded_llvm_maybe_sync, r=Mark-Sim…
Dylan-DPC Oct 22, 2020
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
Sync LLVM submodule if it has been initialized
Since having enabled the download-ci-llvm option,
and having rebased on top of f05b47c,
I've noticed that I had to update the llvm-project
submodule manually if it was checked out.
Orignally, the submodule update logic was
introduced to reduce the friction for contributors
to manage the submodules, or in other words, to prevent
getting PRs that have unwanted submodule rollbacks
because the contributors didn't run git submodule update.

This commit adds logic to ensure there is no inadvertent
LLVM submodule rollback in a PR if download-ci-llvm
(or llvm-config) is enabled. It will detect whether the
llvm-project submodule is initialized, and if so, update
it in any case. If it is not initialized, behaviour is
kept to not do any update/initialization.

An alternative to the chosen implementation would
be to not pass the --init command line arg to
`git submodule update` for the src/llvm-project
submodule. This would show a confusing error message
however on all builds with an uninitialized repo.
We could pass the --silent param, but we still want
it to print something if it is initialized and has
to update something.
So we just do a manual check for whether the
submodule is initialized.
  • Loading branch information
est31 committed Oct 20, 2020
commit 5948e62f3443df626cc803fd3a08bc24e42209e8
7 changes: 6 additions & 1 deletion src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -891,10 +891,15 @@ def update_submodules(self):
).decode(default_encoding).splitlines()]
filtered_submodules = []
submodules_names = []
llvm_checked_out = os.path.exists(os.path.join(self.rust_root, "src/llvm-project/.git"))
for module in submodules:
if module.endswith("llvm-project"):
# Don't sync the llvm-project submodule either if an external LLVM
# was provided, or if we are downloading LLVM. Also, if the
# submodule has been initialized already, sync it anyways so that
# it doesn't mess up contributor pull requests.
if self.get_toml('llvm-config') or self.downloading_llvm():
if self.get_toml('lld') != 'true':
if self.get_toml('lld') != 'true' and not llvm_checked_out:
continue
check = self.check_submodule(module, slow_submodules)
filtered_submodules.append((module, check))
Expand Down