diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-11-29 16:02:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-29 16:02:24 +0100 |
| commit | eabe6db9b195fa9431f00afcd66f890f57acc4bf (patch) | |
| tree | f35f50a0fb357bce68ecfe488710c86bd359c768 | |
| parent | 53bc38b3fe8ccb24ede38da7eb5557f143692cdb (diff) | |
| parent | 8e7734978245522cbbd14e53e08e888faf031ded (diff) | |
| download | rust-eabe6db9b195fa9431f00afcd66f890f57acc4bf.tar.gz rust-eabe6db9b195fa9431f00afcd66f890f57acc4bf.zip | |
Rollup merge of #133592 - WaffleLapkin:misc-meowing, r=jieyouxu
Misc: better instructions for envrc, ignore `/build` instead of `build/` See commits for more information. r? ``@jieyouxu``
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | compiler/rustc_mir_build/src/build/expr/as_rvalue.rs | 2 | ||||
| -rw-r--r-- | src/tools/nix-dev-shell/envrc-flake | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 948133cd76e..ce9db8b861d 100644 --- a/.gitignore +++ b/.gitignore @@ -46,8 +46,7 @@ no_llvm_build /inst/ /llvm/ /mingw-build/ -build/ -!/compiler/rustc_mir_build/src/build/ +/build /build-rust-analyzer/ /dist/ /unicode-downloads diff --git a/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs b/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs index 3f89e337781..c66af118453 100644 --- a/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs +++ b/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs @@ -231,7 +231,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { if range.start <= range.end { BinOp::BitAnd } else { BinOp::BitOr }; let mut comparer = |range: u128, bin_op: BinOp| -> Place<'tcx> { - // We can use `ty::TypingEnv::fully_monomorphized()`` here + // We can use `ty::TypingEnv::fully_monomorphized()` here // as we only need it to compute the layout of a primitive. let range_val = Const::from_bits( this.tcx, diff --git a/src/tools/nix-dev-shell/envrc-flake b/src/tools/nix-dev-shell/envrc-flake index 218d88d8721..9def420f05c 100644 --- a/src/tools/nix-dev-shell/envrc-flake +++ b/src/tools/nix-dev-shell/envrc-flake @@ -1,7 +1,7 @@ # If you want to use this as an .envrc file to create a shell with necessery components # to develop rustc, use the following command in the root of the rusr checkout: # -# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && echo .envrc >> .git/info/exclude +# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && nix flake update --flake ./src/tools/nix-dev-shell && echo .envrc >> .git/info/exclude if nix flake show path:./src/tools/nix-dev-shell &> /dev/null; then use flake path:./src/tools/nix-dev-shell |