about summary refs log tree commit diff
path: root/src/libcore/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-12-16 18:55:07 +0000
committerbors <bors@rust-lang.org>2019-12-16 18:55:07 +0000
commit99b89533d4cdf7682ea4054ad0ee36c351d05df1 (patch)
tree82ce6096679ca921b3eb76f24cf8480ecfc77802 /src/libcore/sync
parentf0d4b571936d4072ed90ab7750636f68f1443b3e (diff)
parent733559b0c292cfa3fd6e4afffd820fa903ea320a (diff)
downloadrust-99b89533d4cdf7682ea4054ad0ee36c351d05df1.tar.gz
rust-99b89533d4cdf7682ea4054ad0ee36c351d05df1.zip
Auto merge of #67356 - Centril:rollup-paaw3ju, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #67249 (Improve code generated for `starts_with(<literal char>)`)
 - #67308 (Delete flaky test net::tcp::tests::fast_rebind)
 - #67318 (Improve typeck & lowering docs for slice patterns)
 - #67322 (use Self alias in place of macros)
 - #67323 (make transparent enums more ordinary)
 - #67336 (Fix JS error when loading page with search)
 - #67344 (.gitignore: Don't ignore a file that exists in the repository)
 - #67349 (Minor: update Unsize docs for dyn syntax)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libcore/sync')
-rw-r--r--src/libcore/sync/atomic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 7756335ee20..d5b0bc42038 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -1263,7 +1263,7 @@ let atomic_forty_two = ", stringify!($atomic_type), "::new(42);
                 #[$stable]
                 #[cfg_attr(not(bootstrap), $const_stable)]
                 pub const fn new(v: $int_type) -> Self {
-                    $atomic_type {v: UnsafeCell::new(v)}
+                    Self {v: UnsafeCell::new(v)}
                 }
             }