Skip to content

Commit d8113d2

Browse files
committed
Revise examples
1 parent 1cd52e6 commit d8113d2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/names/name-resolution.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ mod m2 {
166166
}
167167
168168
use m1::*;
169-
use m2::*; // OK, no name conflict.
169+
use m2::*; // OK: No name conflict.
170170
171171
fn ambiguous_use() {
172172
let x = Ambig; // ERROR: `Ambig` is ambiguous
@@ -183,7 +183,7 @@ fn ambiguous_use() {
183183
# }
184184
#
185185
# use m1::*;
186-
# use m2::*; // OK, no name conflict.
186+
# use m2::*; // OK: No name conflict.
187187
fn ambiguous_shadow() {
188188
// This is permitted, since resolution is not through the ambiguous globs.
189189
struct Ambig;
@@ -234,7 +234,7 @@ pub mod ambig {
234234
235235
const _: () = {
236236
use glob::*;
237-
use ambig::Name; // ERROR: `ambig` is ambiguous
237+
use ambig::Name; // ERROR: `ambig` is ambiguous.
238238
};
239239
```
240240

@@ -255,7 +255,7 @@ pub mod glob {
255255
256256
const _: () = {
257257
use glob::*;
258-
ambig!(); // ERROR: `ambig` is ambiguous
258+
ambig!(); // ERROR: `ambig` is ambiguous.
259259
};
260260
```
261261

@@ -295,7 +295,7 @@ macro_rules! path_based {
295295
}
296296
297297
pub fn f() {
298-
ambig!(); // ERROR: `ambig` is ambiguous
298+
ambig!(); // ERROR: `ambig` is ambiguous.
299299
use path_based as ambig; // In scope for entire function body.
300300
}
301301
```
@@ -353,7 +353,7 @@ macro_rules! define_name {
353353
354354
fn f() {
355355
define_name!();
356-
name!(); // ERROR: `name` is ambiguous
356+
name!(); // ERROR: `name` is ambiguous.
357357
}
358358
```
359359

@@ -377,7 +377,7 @@ User defined attributes or derive macros may not shadow builtin non-macro attrib
377377
```rust,ignore
378378
// src/lib.rs
379379
#[derive(with_helper::WithHelperAttr)]
380-
#[non_exhaustive] // ERROR: `non_exhaustive` is ambiguous
380+
#[non_exhaustive] // ERROR: `non_exhaustive` is ambiguous.
381381
struct S;
382382
```
383383

@@ -404,7 +404,7 @@ struct S;
404404
> // ^----- builtin attr candidate via re-export
405405
>
406406
> #[derive(with_helper::WithHelperAttr)]
407-
> #[helper] // ERROR: `helper` is ambiguous
407+
> #[helper] // ERROR: `helper` is ambiguous.
408408
> struct S;
409409
> ```
410410

0 commit comments

Comments
 (0)