Rollup of 6 pull requests

[Centril]

Successful merges:

• Cleanup (pretty) printing of ty::Const #59276 (Cleanup (pretty) printing of ty::Const)
• Add match arm scopes and other scope fixes #60174 (Add match arm scopes and other scope fixes)
• refactor some FnType stuff to rustc::ty::layout #60693 (refactor some FnType stuff to rustc::ty::layout)
• Move token tree related lexer state to a separate struct #60763 (Move token tree related lexer state to a separate struct)
• Bump measureme dependency to 0.3 #60811 (Bump measureme dependency to 0.3)
• CMake: Do not print installation messages for up-to-date files #60832 (CMake: Do not print installation messages for up-to-date files)

Failed merges:

• Use Symbol more in lint APIs #60827 (Use Symbol more in lint APIs)

r? @ghost

[Centril]

@bors r+ p=6 rollup=never

[bors]

📌 Commit 566f4a9 has been approved by Centril

[bors]

⌛ Testing commit 566f4a9 with merge 23e9d457446d98bb3c1ab292442da4bb2077dbfe...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:25:28] git could not determine the LLVM submodule commit hash. Assuming that an LLVM build is necessary.
[00:25:28] travis_fold:start:llvm
travis_time:start:llvm
Building LLVM for x86_64-unknown-linux-gnu
[00:25:28] running: "cmake" "/checkout/src/llvm-project/llvm" "-DLLVM_ENABLE_ASSERTIONS=ON" "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64;Mips;PowerPC;SystemZ;MSP430;Sparc;NVPTX;Hexagon" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly;RISCV" "-DLLVM_INCLUDE_EXAMPLES=OFF" "-DLLVM_INCLUDE_TESTS=OFF" "-DLLVM_INCLUDE_DOCS=OFF" "-DLLVM_INCLUDE_BENCHMARKS=OFF" "-DLLVM_ENABLE_ZLIB=OFF" "-DWITH_POLLY=OFF" "-DLLVM_ENABLE_TERMINFO=OFF" "-DLLVM_ENABLE_LIBEDIT=OFF" "-DLLVM_PARALLEL_COMPILE_JOBS=4" "-DLLVM_TARGET_ARCH=x86_64" "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-linux-gnu" "-DLLVM_OCAML_INSTALL_PATH=usr/lib/ocaml" "-DLLVM_LINK_LLVM_DYLIB=ON" "-DLLVM_ENABLE_LIBXML2=OFF" "-DLLVM_VERSION_SUFFIX=-rust-1.36.0-dev" "-DPYTHON_EXECUTABLE=/usr/bin/python2.7" "-DCMAKE_INSTALL_MESSAGE=LAZY" "-DCMAKE_C_COMPILER_LAUNCHER=sccache" "-DCMAKE_CXX_COMPILER_LAUNCHER=sccache" "-DCMAKE_C_COMPILER=cc" "-DCMAKE_CXX_COMPILER=c++" "-DCMAKE_C_FLAGS=-ffunction-sections -fdata-sections -fPIC -m64" "-DCMAKE_CXX_FLAGS=-ffunction-sections -fdata-sections -fPIC -m64" "-DCMAKE_INSTALL_PREFIX=/checkout/obj/build/x86_64-unknown-linux-gnu/llvm" "-DCMAKE_BUILD_TYPE=Release"
[00:25:28] -- The CXX compiler identification is GNU 5.4.0
[00:25:28] -- The ASM compiler identification is GNU
[00:25:28] -- Found assembler: /usr/bin/cc
[00:25:28] -- Check for working C compiler: /usr/bin/cc
---
travis_time:end:2fa701b8:start=1557894794147929014,finish=1557894794158132210,duration=10203196
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:144e7e97
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1049ce6c
travis_time:start:1049ce6c
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:052b8493
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)