Rollup of easy patches #7361
Closed
Rollup of easy patches #7361
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The only really tricky change is that a long chain of ifs, and elses was turned into a single if, and a match in astencode.rs. Some methods can only be called in certain cases, and so have to come after the if.
Signed-off-by: Ramkumar Ramachandra <[email protected]>
The last change was made in 2013 not 2012.
Conflicts: src/librustc/middle/astencode.rs src/librustc/middle/check_const.rs
bors
added a commit
that referenced
this pull request
Jun 27, 2013
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Jul 1, 2021
…flip1995 Added `cargo dev setup git-hook` and updated `cargo dev setup intellij` including a `remove` command This PR enables our dev tool to install a git hook that formats the code before each commit and also runs `update_lints` to make sure that everything is registered correctly. The script is located at `util/etc/pre-commit.sh`. I found it reasonable to locate it in the `util` folder and decided to add a `etc` in correlation to the main rust repo and to bring a bit of structure into it. * The hook can be installed via: `cargo dev setup git-hook` * And removed via: `cargo dev remove git-hook` cc: rust-lang#5394 The refactoring of `src/ide_setup.rs` to `src/setup/intellij.rs` is an extra commit to simplify the review. --- Changes: * Added `cargo dev setup git-hook` for formatting before every commit * Added `cargo dev remove git-hook` to remove the hook again * Added `cargo dev remove intellij` to remove rustc source path dependencies * Changed `cargo dev ide_setup` to `cargo dev setup intellij` changelog: none This is only an internal change and therefore not worth an entry in the general change log. --- Tested on: * [x] Linux (by `@xFrednet)` * [ ] Windows (All used commands run inside the git bash, so it's very likely to work as well `@xFrednet)` * [ ] macOS
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.