Skip to content

Commit eabe6db

Browse files
authored
Rollup merge of rust-lang#133592 - WaffleLapkin:misc-meowing, r=jieyouxu
Misc: better instructions for envrc, ignore `/build` instead of `build/` See commits for more information. r? ``@jieyouxu``
2 parents 53bc38b + 8e77349 commit eabe6db

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ no_llvm_build
4646
/inst/
4747
/llvm/
4848
/mingw-build/
49-
build/
50-
!/compiler/rustc_mir_build/src/build/
49+
/build
5150
/build-rust-analyzer/
5251
/dist/
5352
/unicode-downloads

compiler/rustc_mir_build/src/build/expr/as_rvalue.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
231231
if range.start <= range.end { BinOp::BitAnd } else { BinOp::BitOr };
232232

233233
let mut comparer = |range: u128, bin_op: BinOp| -> Place<'tcx> {
234-
// We can use `ty::TypingEnv::fully_monomorphized()`` here
234+
// We can use `ty::TypingEnv::fully_monomorphized()` here
235235
// as we only need it to compute the layout of a primitive.
236236
let range_val = Const::from_bits(
237237
this.tcx,

src/tools/nix-dev-shell/envrc-flake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# If you want to use this as an .envrc file to create a shell with necessery components
22
# to develop rustc, use the following command in the root of the rusr checkout:
33
#
4-
# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && echo .envrc >> .git/info/exclude
4+
# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && nix flake update --flake ./src/tools/nix-dev-shell && echo .envrc >> .git/info/exclude
55

66
if nix flake show path:./src/tools/nix-dev-shell &> /dev/null; then
77
use flake path:./src/tools/nix-dev-shell

0 commit comments

Comments
 (0)