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 0623286

Browse files
committedDec 21, 2018
Auto merge of #57025 - pietroalbini:rollup, r=pietroalbini
Rollup of 20 pull requests Successful merges: - #56802 (Add DoubleEndedIterator::nth_back) - #56842 (Add unstable VecDeque::rotate_{left|right}) - #56869 (Reduce search-index.js size) - #56887 (Disable field reordering for repr(int).) - #56892 (rustc: Update Clang used to build LLVM on Linux) - #56909 (static eval: Do not ICE on layout size overflow) - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) - #56917 (Simplify MIR generation for logical operations) - #56919 (Remove a wrong multiplier on relocation offset computation) - #56933 (Add --progress to git submodule commands in x.py) - #56941 (deny intra-doc link resolution failures in libstd) - #56964 (Remove `TokenStream::JointTree`.) - #56970 (Mem uninit doc ptr drop) - #56973 (make basic CTFE tracing available on release builds) - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.) - #56981 (miri: allocation is infallible) - #56984 (A few tweaks to dropck_outlives) - #56989 (Fix compiletest `trim` deprecation warnings) - #56992 (suggest similar lint names for unknown lints) - #57002 (Stabilize Vec(Deque)::resize_with) Failed merges: r? @ghost
2 parents 01c6ea2 + bc674ab commit 0623286

Some content is hidden

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

60 files changed

+877
-284
lines changed
 

‎Cargo.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
13341334

13351335
[[package]]
13361336
name = "minifier"
1337-
version = "0.0.20"
1337+
version = "0.0.21"
13381338
source = "registry+https://github.com/rust-lang/crates.io-index"
13391339
dependencies = [
13401340
"macro-utils 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2686,7 +2686,7 @@ dependencies = [
26862686
name = "rustdoc"
26872687
version = "0.0.0"
26882688
dependencies = [
2689-
"minifier 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
2689+
"minifier 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
26902690
"parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
26912691
"pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
26922692
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3502,7 +3502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
35023502
"checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16"
35033503
"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
35043504
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
3505-
"checksum minifier 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "96c269bb45c39b333392b2b18ad71760b34ac65666591386b0e959ed58b3f474"
3505+
"checksum minifier 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "9707d0ff1b828cba09c4bb27d5c3dceb6f49bd46f700042343bea350a131bf4f"
35063506
"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
35073507
"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
35083508
"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"

‎src/bootstrap/bootstrap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,10 @@ def update_submodule(self, module, checked_out, recorded_submodules):
678678

679679
print("Updating submodule", module)
680680

681-
run(["git", "submodule", "-q", "sync", module],
681+
run(["git", "submodule", "-q", "sync", "--progress", module],
682682
cwd=self.rust_root, verbose=self.verbose)
683683
run(["git", "submodule", "update",
684-
"--init", "--recursive", module],
684+
"--init", "--recursive", "--progress", module],
685685
cwd=self.rust_root, verbose=self.verbose)
686686
run(["git", "reset", "-q", "--hard"],
687687
cwd=module_path, verbose=self.verbose)

0 commit comments

Comments
 (0)
Please sign in to comment.