]> git.lizzy.rs Git - rust.git/log
rust.git
3 years agointernal: add ranges to minicore
Aleksey Kladov [Tue, 15 Jun 2021 18:45:25 +0000 (21:45 +0300)]
internal: add ranges to minicore

3 years agointernal: unindent some tests
Aleksey Kladov [Tue, 15 Jun 2021 18:39:44 +0000 (21:39 +0300)]
internal: unindent some tests

3 years agointernal: switch some tests to minicore
Aleksey Kladov [Tue, 15 Jun 2021 18:36:50 +0000 (21:36 +0300)]
internal: switch some tests to minicore

3 years agointernal: switch some tests to minicore
Aleksey Kladov [Tue, 15 Jun 2021 18:34:26 +0000 (21:34 +0300)]
internal: switch some tests to minicore

3 years agointernal: switch some tests to minicore
Aleksey Kladov [Tue, 15 Jun 2021 18:18:26 +0000 (21:18 +0300)]
internal: switch some tests to minicore

3 years agointernal: switch some tests to minicore
Aleksey Kladov [Tue, 15 Jun 2021 18:11:53 +0000 (21:11 +0300)]
internal: switch some tests to minicore

3 years agointernal: introduce minicore -- a subset of libcore for testing
Aleksey Kladov [Tue, 15 Jun 2021 18:02:40 +0000 (21:02 +0300)]
internal: introduce minicore -- a subset of libcore for testing

3 years agominor: fix typo
Aleksey Kladov [Tue, 15 Jun 2021 14:20:11 +0000 (17:20 +0300)]
minor: fix typo

3 years agointernal: enforce no #[ignore] and no #[should_panic]
Aleksey Kladov [Tue, 15 Jun 2021 13:54:43 +0000 (16:54 +0300)]
internal: enforce no #[ignore] and no #[should_panic]

3 years agointernal: don't #[ignore] tests
Aleksey Kladov [Tue, 15 Jun 2021 13:37:58 +0000 (16:37 +0300)]
internal: don't #[ignore] tests

See the style.md for motivation

3 years agoMerge #9288
bors[bot] [Tue, 15 Jun 2021 09:49:30 +0000 (09:49 +0000)]
Merge #9288

9288: internal: cleanup tests r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: cleanup tests
Aleksey Kladov [Tue, 15 Jun 2021 09:48:05 +0000 (12:48 +0300)]
internal: cleanup tests

* ensure standard, non-indented style (should add this check to
  `fixture` some day)
* removed a couple of ignores

3 years agoMerge #9285
bors[bot] [Tue, 15 Jun 2021 08:59:08 +0000 (08:59 +0000)]
Merge #9285

9285: minor: add a test variation r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agominor: add a test variation
Aleksey Kladov [Tue, 15 Jun 2021 08:58:39 +0000 (11:58 +0300)]
minor: add a test variation

3 years agoMerge #9278
bors[bot] [Tue, 15 Jun 2021 08:48:15 +0000 (08:48 +0000)]
Merge #9278

9278: internal: document that we don't #[ignore] tests r=matklad a=matklad

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: document that we don't #[ignore] tests
Aleksey Kladov [Mon, 14 Jun 2021 19:55:05 +0000 (22:55 +0300)]
internal: document that we don't #[ignore] tests

3 years agoMerge #9282
bors[bot] [Tue, 15 Jun 2021 06:47:33 +0000 (06:47 +0000)]
Merge #9282

9282: fix: Use objects instead of bools for markers in package.json r=lnicola a=lnicola

Addresses https://github.com/rust-analyzer/rust-analyzer/issues/9174#issue-913980665.

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
3 years agoUse objects instead of bools for markers in package.json
Laurențiu Nicola [Tue, 15 Jun 2021 06:32:53 +0000 (09:32 +0300)]
Use objects instead of bools for markers in package.json

3 years agoMerge #9281
bors[bot] [Tue, 15 Jun 2021 06:38:53 +0000 (06:38 +0000)]
Merge #9281

9281: fix: Code: use `Uri.toString()` for URLs r=lnicola a=wxb1ank

I believe this should fix #9280. Testing is needed but I wanted to quickly push a hotfix.

Co-authored-by: wxb1ank <wxblank@gmail.com>
3 years agoUse `Uri.toString()` for URLs
wxb1ank [Tue, 15 Jun 2021 03:29:38 +0000 (23:29 -0400)]
Use `Uri.toString()` for URLs

3 years agoMerge #9277
bors[bot] [Mon, 14 Jun 2021 19:44:59 +0000 (19:44 +0000)]
Merge #9277

9277: internal: more natural order of sources for TypeParam r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: more natural order of sources for TypeParam
Aleksey Kladov [Mon, 14 Jun 2021 19:42:43 +0000 (22:42 +0300)]
internal: more natural order of sources for TypeParam

We usually use first (left) variant of `Either` for "usual" case, and
use right for odd things. For example, pat source is Pat | SelfParam.

3 years agoMerge #9276
bors[bot] [Mon, 14 Jun 2021 19:37:28 +0000 (19:37 +0000)]
Merge #9276

9276: internal: refactor diagnostics more r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: test diagnostic severeties and presense of fixes
Aleksey Kladov [Mon, 14 Jun 2021 19:06:28 +0000 (22:06 +0300)]
internal: test diagnostic severeties and presense of fixes

3 years agominor: make diagnostics more similar
Aleksey Kladov [Mon, 14 Jun 2021 18:23:59 +0000 (21:23 +0300)]
minor: make diagnostics more similar

3 years agoMerge #9275
bors[bot] [Mon, 14 Jun 2021 19:08:05 +0000 (19:08 +0000)]
Merge #9275

9275: feat: Support goto type for field expressions and patterns r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
3 years agoSupport goto type for field expressions and patterns
Lukas Wirth [Mon, 14 Jun 2021 19:07:07 +0000 (21:07 +0200)]
Support goto type for field expressions and patterns

3 years agoMerge #9273
bors[bot] [Mon, 14 Jun 2021 17:41:52 +0000 (17:41 +0000)]
Merge #9273

9273: internal: don't pull tracing via chalk r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: don't pull tracing via chalk
Aleksey Kladov [Mon, 14 Jun 2021 17:41:08 +0000 (20:41 +0300)]
internal: don't pull tracing via chalk

3 years agoMerge #9272
bors[bot] [Mon, 14 Jun 2021 16:46:25 +0000 (16:46 +0000)]
Merge #9272

9272: internal: move diagnostics to a dedicated crate r=matklad a=matklad

bors r+

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: document diagnostics crate
Aleksey Kladov [Mon, 14 Jun 2021 16:32:39 +0000 (19:32 +0300)]
internal: document diagnostics crate

3 years agoMerge #9270
bors[bot] [Mon, 14 Jun 2021 16:17:55 +0000 (16:17 +0000)]
Merge #9270

9270: minor: Add assoc type in trait bound completion test r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
3 years agoAdd assoc type in trait bound completion test
Lukas Wirth [Mon, 14 Jun 2021 16:17:21 +0000 (18:17 +0200)]
Add assoc type in trait bound completion test

3 years agominor: less ambiguous name
Aleksey Kladov [Mon, 14 Jun 2021 16:15:53 +0000 (19:15 +0300)]
minor: less ambiguous name

3 years agointernal: flatten module hierarchy
Aleksey Kladov [Mon, 14 Jun 2021 16:14:34 +0000 (19:14 +0300)]
internal: flatten module hierarchy

It seems that any crate can be made better by flattening the modules
down to a single layer?

3 years agointernal: document rename challenges
Aleksey Kladov [Mon, 14 Jun 2021 16:08:12 +0000 (19:08 +0300)]
internal: document rename challenges

3 years agointernal: adapt diagnostics to the new rename API
Aleksey Kladov [Mon, 14 Jun 2021 15:46:27 +0000 (18:46 +0300)]
internal: adapt diagnostics to the new rename API

3 years agointernal: cut deps between assists and diagnostics
Aleksey Kladov [Mon, 14 Jun 2021 10:27:11 +0000 (13:27 +0300)]
internal: cut deps between assists and diagnostics

3 years agointernal: prepare to move assist definitions
Aleksey Kladov [Mon, 14 Jun 2021 10:18:03 +0000 (13:18 +0300)]
internal: prepare to move assist definitions

3 years agointernal: move diagnostics to a new crate
Aleksey Kladov [Mon, 14 Jun 2021 10:15:05 +0000 (13:15 +0300)]
internal: move diagnostics to a new crate

3 years agointernal: start ide diagnostics crate
Aleksey Kladov [Mon, 14 Jun 2021 09:24:58 +0000 (12:24 +0300)]
internal: start ide diagnostics crate

3 years agoMerge #9265
bors[bot] [Mon, 14 Jun 2021 14:30:59 +0000 (14:30 +0000)]
Merge #9265

9265: internal: prepare to move rename to base_db  r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: prepare to move rename to base_db
Aleksey Kladov [Mon, 14 Jun 2021 14:19:41 +0000 (17:19 +0300)]
internal: prepare to move rename to base_db

It's better to handle magical cases upper in the stack, because it
allows for better re-use of the general implementation below. So, we
pull the `self` case up here.

The end goal is to put `Definition::rename` to the `ide_db`, because
it's a generally re-usable functionality useful for different ide
features, alongside with the search which is already there.

3 years agoMerge #9263
bors[bot] [Mon, 14 Jun 2021 12:46:38 +0000 (12:46 +0000)]
Merge #9263

9263: fix: don't use display-related functionality where semantics matters r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agofix: don't use display-related functionality where semantics matters
Aleksey Kladov [Mon, 14 Jun 2021 12:43:59 +0000 (15:43 +0300)]
fix: don't use display-related functionality where semantics matters

NavigationTarget is strictly a UI-level thing -- it describes where the
cursor should be placed when the user presses goto definition. It
doesn't make any semantic guaratees about rage and focus range and, as
such, is not suitable for driving renames.

3 years agoMerge #9262
bors[bot] [Mon, 14 Jun 2021 11:57:20 +0000 (11:57 +0000)]
Merge #9262

9262: fix: Don't keep a trailing `self` token in import paths after `unmerge_use` r=Veykril a=Veykril

Fixes #9213
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
3 years agoDon't keep a trailing self token in import paths after unmerge_use
Lukas Wirth [Mon, 14 Jun 2021 11:56:33 +0000 (13:56 +0200)]
Don't keep a trailing self token in import paths after unmerge_use

3 years agoMerge #8951
bors[bot] [Mon, 14 Jun 2021 10:30:10 +0000 (10:30 +0000)]
Merge #8951

8951: internal: migrate to vscode.FileSystem API r=matklad a=wxb1ank

I encountered an error where `bootstrap()` attempts to create a directory with the path `C:\C:\...`. I couldn't find this reported anywhere else. Using the `vscode.FileSystem` API instead of the `fs` one works here. I assume the latter automatically prepends `C:\` to paths whereas the former does not. I don't know if this suggests `vscode.FileSystem` should be used in more places for consistency.

Co-authored-by: wxb1ank <wxblank@gmail.com>
3 years agoMerge #9261
bors[bot] [Mon, 14 Jun 2021 07:40:45 +0000 (07:40 +0000)]
Merge #9261

9261: minor: dev/architecture.md: Fix typo in env-var quoting r=lnicola a=lf-

Co-authored-by: Jade <software@lfcode.ca>
3 years agoFix typo in env-var quoting
Jade [Mon, 14 Jun 2021 07:38:28 +0000 (00:38 -0700)]
Fix typo in env-var quoting

3 years agoMerge #9260
bors[bot] [Mon, 14 Jun 2021 07:16:48 +0000 (07:16 +0000)]
Merge #9260

9260: tree-wide: make rustdoc links spiky so they are clickable r=matklad a=lf-

Rustdoc was complaining about these while I was running with --document-private-items and I figure they should be fixed.

Co-authored-by: Jade <software@lfcode.ca>
3 years agotree-wide: make rustdoc links spiky so they are clickable
Jade [Mon, 14 Jun 2021 04:57:10 +0000 (21:57 -0700)]
tree-wide: make rustdoc links spiky so they are clickable

3 years agoMerge #9257
bors[bot] [Sun, 13 Jun 2021 19:17:57 +0000 (19:17 +0000)]
Merge #9257

9257: internal: diagnostic code is mandatory r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: diagnostic code is mandatory
Aleksey Kladov [Sun, 13 Jun 2021 19:17:05 +0000 (22:17 +0300)]
internal: diagnostic code is mandatory

3 years agominor: dead code
Aleksey Kladov [Sun, 13 Jun 2021 19:11:33 +0000 (22:11 +0300)]
minor: dead code

3 years agoMerge #9256
bors[bot] [Sun, 13 Jun 2021 19:06:18 +0000 (19:06 +0000)]
Merge #9256

9256: internal: kill diagnostic sink r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: kill diagnostic sink
Aleksey Kladov [Sun, 13 Jun 2021 19:05:47 +0000 (22:05 +0300)]
internal: kill diagnostic sink

3 years agointernal: use cov-mark rather than bailing out diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 18:55:51 +0000 (21:55 +0300)]
internal: use cov-mark rather than bailing out diagnostic

3 years agointernal: refactor missing match arms diagnostics
Aleksey Kladov [Sun, 13 Jun 2021 18:44:31 +0000 (21:44 +0300)]
internal: refactor missing match arms diagnostics

3 years agoMerge #9255
bors[bot] [Sun, 13 Jun 2021 18:34:32 +0000 (18:34 +0000)]
Merge #9255

9255: internal: remove DiagnosticWithFix infra r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: remove DiagnosticWithFix infra
Aleksey Kladov [Sun, 13 Jun 2021 18:33:54 +0000 (21:33 +0300)]
internal: remove DiagnosticWithFix infra

3 years agointernal: refactor incorrect case diagnostics
Aleksey Kladov [Sun, 13 Jun 2021 18:09:03 +0000 (21:09 +0300)]
internal: refactor incorrect case diagnostics

3 years agoMerge #9253
bors[bot] [Sun, 13 Jun 2021 17:35:03 +0000 (17:35 +0000)]
Merge #9253

9253: internal: refactor missing or or some diagnostic r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agominor
Aleksey Kladov [Sun, 13 Jun 2021 17:33:59 +0000 (20:33 +0300)]
minor

3 years agointernal: refactor find_map diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 17:32:54 +0000 (20:32 +0300)]
internal: refactor find_map diagnostic

3 years agominor
Aleksey Kladov [Sun, 13 Jun 2021 17:20:58 +0000 (20:20 +0300)]
minor

3 years agointernal: refactor missing or or some diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 17:19:11 +0000 (20:19 +0300)]
internal: refactor missing or or some diagnostic

3 years agointernal: refactor remove this semicolon diagnostics
Aleksey Kladov [Sun, 13 Jun 2021 17:13:15 +0000 (20:13 +0300)]
internal: refactor remove this semicolon diagnostics

3 years agoMerge #9252
bors[bot] [Sun, 13 Jun 2021 17:07:04 +0000 (17:07 +0000)]
Merge #9252

9252: internal: refactor mismatched args count diagnostic r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: refactor mismatched args count diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 17:06:25 +0000 (20:06 +0300)]
internal: refactor mismatched args count diagnostic

3 years agointernal: refactor missing unsafe diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 17:00:27 +0000 (20:00 +0300)]
internal: refactor missing unsafe diagnostic

3 years agointernal: refactor BreakOutsideOfLoop diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 16:51:19 +0000 (19:51 +0300)]
internal: refactor BreakOutsideOfLoop diagnostic

3 years agointernal: refactor NoSuchField diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 16:45:16 +0000 (19:45 +0300)]
internal: refactor NoSuchField diagnostic

3 years agointernal: refactor unimplemented builtin macro diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 16:35:30 +0000 (19:35 +0300)]
internal: refactor unimplemented builtin macro diagnostic

3 years agoMerge #9251
bors[bot] [Sun, 13 Jun 2021 16:33:03 +0000 (16:33 +0000)]
Merge #9251

9251: minor: simplify r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agominor: simplify
Aleksey Kladov [Sun, 13 Jun 2021 16:27:14 +0000 (19:27 +0300)]
minor: simplify

3 years agoMerge #9250
bors[bot] [Sun, 13 Jun 2021 16:24:35 +0000 (16:24 +0000)]
Merge #9250

9250: internal: check diagnostics in all files and not just the first one r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: check diagnostics in all files and not just the first one
Aleksey Kladov [Sun, 13 Jun 2021 16:23:37 +0000 (19:23 +0300)]
internal: check diagnostics in all files and not just the first one

3 years agoMerge #9249
bors[bot] [Sun, 13 Jun 2021 15:46:09 +0000 (15:46 +0000)]
Merge #9249

9249: internal: remove def-level diagnostics tests r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: remove def-level diagnostics tests
Aleksey Kladov [Sun, 13 Jun 2021 15:45:38 +0000 (18:45 +0300)]
internal: remove def-level diagnostics tests

3 years agointernal: refactor macro error
Aleksey Kladov [Sun, 13 Jun 2021 15:41:04 +0000 (18:41 +0300)]
internal: refactor macro error

3 years agointernal: refactor unresolved proc macro diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 14:51:44 +0000 (17:51 +0300)]
internal: refactor unresolved proc macro diagnostic

3 years agointernal: refactor inactive code diagnostics
Aleksey Kladov [Sun, 13 Jun 2021 14:29:25 +0000 (17:29 +0300)]
internal: refactor inactive code diagnostics

3 years agoMerge #9248
bors[bot] [Sun, 13 Jun 2021 14:09:41 +0000 (14:09 +0000)]
Merge #9248

9248: internal: refactor unresolved macro call diagnostic r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: refactor unresolved macro call diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 14:06:36 +0000 (17:06 +0300)]
internal: refactor unresolved macro call diagnostic

3 years agointernal: refactor unresolved import diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 13:42:34 +0000 (16:42 +0300)]
internal: refactor unresolved import diagnostic

3 years agoMerge #9247
bors[bot] [Sun, 13 Jun 2021 13:06:27 +0000 (13:06 +0000)]
Merge #9247

9247: internal: refactor unresolved extern crate diagnostic r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: refactor unresolved extern crate diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 13:05:43 +0000 (16:05 +0300)]
internal: refactor unresolved extern crate diagnostic

3 years agoMerge #9246
bors[bot] [Sun, 13 Jun 2021 12:49:37 +0000 (12:49 +0000)]
Merge #9246

9246: internal: unified missing fields diagnostic r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: unified missing fields diagnostic
Aleksey Kladov [Sun, 13 Jun 2021 12:48:54 +0000 (15:48 +0300)]
internal: unified missing fields diagnostic

3 years agointernal: move missing_fields diagnostics
Aleksey Kladov [Sun, 13 Jun 2021 12:27:15 +0000 (15:27 +0300)]
internal: move missing_fields diagnostics

3 years agoMerge #9245
bors[bot] [Sun, 13 Jun 2021 11:56:15 +0000 (11:56 +0000)]
Merge #9245

9245: internal: start new diagnostics API r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: start new diagnostics API
Aleksey Kladov [Sun, 13 Jun 2021 11:41:19 +0000 (14:41 +0300)]
internal: start new diagnostics API

At the moment, this moves only a single diagnostic, but the idea is
reafactor the rest to use the same pattern. We are going to have a
single file per diagnostic. This file will define diagnostics code,
rendering range and fixes, if any. It'll also have all of the tests.
This is similar to how we deal with assists.

After we refactor all diagnostics to follow this pattern, we'll probably
move them to a new `ide_diagnostics` crate.

Not that we intentionally want to test all diagnostics on this layer,
despite the fact that they are generally emitted in the guts on the
compiler. Diagnostics care to much about the end presentation
details/fixes to be worth-while "unit" testing. So, we'll unit-test only
the primary output of compilation process (types and name res tables),
and will use integrated UI tests for diagnostics.

3 years agoMerge #9244
bors[bot] [Sun, 13 Jun 2021 11:13:31 +0000 (11:13 +0000)]
Merge #9244

9244: feat: Make block-local trait impls work r=flodiebold a=flodiebold

As long as either the trait or the implementing type are defined in the same block.

CC #8961

Co-authored-by: Florian Diebold <flodiebold@gmail.com>
3 years agoMake block-local trait impls work
Florian Diebold [Sun, 13 Jun 2021 11:00:34 +0000 (13:00 +0200)]
Make block-local trait impls work

As long as either the trait or the implementing type are defined in the
same block.

3 years agoMerge #9243
bors[bot] [Sun, 13 Jun 2021 10:13:56 +0000 (10:13 +0000)]
Merge #9243

9243: internal: check that coverage marks are always paired r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
3 years agointernal: check that coverage marks are always paired
Aleksey Kladov [Sun, 13 Jun 2021 09:33:08 +0000 (12:33 +0300)]
internal: check that coverage marks are always paired

3 years agominor: put a mark back
Aleksey Kladov [Sun, 13 Jun 2021 08:49:32 +0000 (11:49 +0300)]
minor: put a mark back

3 years agoMerge #9242
bors[bot] [Sun, 13 Jun 2021 07:18:49 +0000 (07:18 +0000)]
Merge #9242

9242: Clippy r=matklad a=Maan2003

Best viewed commit wise

Co-authored-by: Maan2003 <manmeetmann2003@gmail.com>
3 years agoMerge #9240
bors[bot] [Sun, 13 Jun 2021 06:58:37 +0000 (06:58 +0000)]
Merge #9240

9240: Fixed a small typo in comment r=matklad a=fee1-dead

Co-authored-by: fee1-dead <ent3rm4n@gmail.com>