Skip to content

Commit ec65e06

Browse files
committed
Rollup merge of rust-lang#21535 - steveklabnik:gh19759, r=alexcrichton
Fixes rust-lang#19759 I'm not going to bother to do more than this, as it'll end up getting re-done as part of the reference work, but at least it's correct now.
2 parents f16f216 + dc2b3ac commit ec65e06

File tree

1 file changed

+1
-130
lines changed

1 file changed

+1
-130
lines changed

src/doc/reference.md

Lines changed: 1 addition & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,136 +2291,7 @@ The name `str_eq` has a special meaning to the Rust compiler, and the presence
22912291
of this definition means that it will use this definition when generating calls
22922292
to the string equality function.
22932293

2294-
A complete list of the built-in language items follows:
2295-
2296-
#### Built-in Traits
2297-
2298-
* `copy`
2299-
: Types that do not move ownership when used by-value.
2300-
* `drop`
2301-
: Have destructors.
2302-
* `send`
2303-
: Able to be sent across thread boundaries.
2304-
* `sized`
2305-
: Has a size known at compile time.
2306-
* `sync`
2307-
: Able to be safely shared between threads when aliased.
2308-
2309-
#### Operators
2310-
2311-
These language items are traits:
2312-
2313-
* `add`
2314-
: Elements can be added (for example, integers and floats).
2315-
* `sub`
2316-
: Elements can be subtracted.
2317-
* `mul`
2318-
: Elements can be multiplied.
2319-
* `div`
2320-
: Elements have a division operation.
2321-
* `rem`
2322-
: Elements have a remainder operation.
2323-
* `neg`
2324-
: Elements can be negated arithmetically.
2325-
* `not`
2326-
: Elements can be negated logically.
2327-
* `bitxor`
2328-
: Elements have an exclusive-or operation.
2329-
* `bitand`
2330-
: Elements have a bitwise `and` operation.
2331-
* `bitor`
2332-
: Elements have a bitwise `or` operation.
2333-
* `shl`
2334-
: Elements have a left shift operation.
2335-
* `shr`
2336-
: Elements have a right shift operation.
2337-
* `index`
2338-
: Elements can be indexed.
2339-
* `index_mut`
2340-
: ___Needs filling in___
2341-
* `eq`
2342-
: Elements can be compared for equality.
2343-
* `ord`
2344-
: Elements have a partial ordering.
2345-
* `deref`
2346-
: `*` can be applied, yielding a reference to another type.
2347-
* `deref_mut`
2348-
: `*` can be applied, yielding a mutable reference to another type.
2349-
2350-
These are functions:
2351-
2352-
* `fn`
2353-
: ___Needs filling in___
2354-
* `fn_mut`
2355-
: ___Needs filling in___
2356-
* `fn_once`
2357-
: ___Needs filling in___
2358-
* `str_eq`
2359-
: Compare two strings (`&str`) for equality.
2360-
* `strdup_uniq`
2361-
: Return a new unique string
2362-
containing a copy of the contents of a unique string.
2363-
2364-
#### Types
2365-
2366-
* `type_id`
2367-
: The type returned by the `type_id` intrinsic.
2368-
* `unsafe`
2369-
: A type whose contents can be mutated through an immutable reference.
2370-
2371-
#### Marker types
2372-
2373-
These types help drive the compiler's analysis
2374-
2375-
* `begin_unwind`
2376-
: ___Needs filling in___
2377-
* `no_copy_bound`
2378-
: This type does not implement "copy", even if eligible.
2379-
* `eh_personality`
2380-
: ___Needs filling in___
2381-
* `exchange_free`
2382-
: Free memory that was allocated on the exchange heap.
2383-
* `exchange_malloc`
2384-
: Allocate memory on the exchange heap.
2385-
* `closure_exchange_malloc`
2386-
: ___Needs filling in___
2387-
* `panic`
2388-
: Abort the program with an error.
2389-
* `fail_bounds_check`
2390-
: Abort the program with a bounds check error.
2391-
* `free`
2392-
: Free memory that was allocated on the managed heap.
2393-
* `gc`
2394-
: ___Needs filling in___
2395-
* `exchange_heap`
2396-
: ___Needs filling in___
2397-
* `iterator`
2398-
: ___Needs filling in___
2399-
* `contravariant_lifetime`
2400-
: The lifetime parameter should be considered contravariant.
2401-
* `covariant_lifetime`
2402-
: The lifetime parameter should be considered covariant.
2403-
* `invariant_lifetime`
2404-
: The lifetime parameter should be considered invariant.
2405-
* `malloc`
2406-
: Allocate memory on the managed heap.
2407-
* `owned_box`
2408-
: ___Needs filling in___
2409-
* `stack_exhausted`
2410-
: ___Needs filling in___
2411-
* `start`
2412-
: ___Needs filling in___
2413-
* `contravariant_type`
2414-
: The type parameter should be considered contravariant.
2415-
* `covariant_type`
2416-
: The type parameter should be considered covariant.
2417-
* `invariant_type`
2418-
: The type parameter should be considered invariant.
2419-
* `ty_desc`
2420-
: ___Needs filling in___
2421-
2422-
> **Note:** This list is likely to become out of date. We should auto-generate
2423-
> it from `librustc/middle/lang_items.rs`.
2294+
A complete list of the built-in language items will be added in the future.
24242295

24252296
### Inline attributes
24262297

0 commit comments

Comments
 (0)