From e48030d7d11f2bf90692907ff5f066f25f9eeb5d Mon Sep 17 00:00:00 2001 From: Florian Hahn Date: Tue, 1 Dec 2015 12:54:43 +0100 Subject: [PATCH] Replace uses of int/uint with isize/uzsize in doc examples --- src/librustc/middle/infer/region_inference/mod.rs | 4 ++-- src/librustc/middle/liveness.rs | 2 +- src/librustc_borrowck/borrowck/check_loans.rs | 4 ++-- src/librustc_borrowck/borrowck/gather_loans/mod.rs | 4 +++- src/librustc_trans/trans/debuginfo/doc.rs | 2 +- src/librustc_trans/trans/meth.rs | 4 ++-- src/librustc_typeck/check/regionck.rs | 8 ++++---- src/librustc_typeck/variance.rs | 14 +++++++------- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/librustc/middle/infer/region_inference/mod.rs b/src/librustc/middle/infer/region_inference/mod.rs index dd95fc4cc0d..df620d4a04e 100644 --- a/src/librustc/middle/infer/region_inference/mod.rs +++ b/src/librustc/middle/infer/region_inference/mod.rs @@ -159,8 +159,8 @@ pub enum RegionResolutionError<'tcx> { /// like to indicate so to the user. /// For example, the following function /// ``` -/// struct Foo { bar: int } -/// fn foo2<'a, 'b>(x: &'a Foo) -> &'b int { +/// struct Foo { bar: isize } +/// fn foo2<'a, 'b>(x: &'a Foo) -> &'b isize { /// &x.bar /// } /// ``` diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 9b18b79d261..14c2e1f5aac 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -1583,7 +1583,7 @@ fn warn_about_unused(&self, let r = self.should_warn(var); if let Some(name) = r { - // annoying: for parameters in funcs like `fn(x: int) + // annoying: for parameters in funcs like `fn(x: isize) // {ret}`, there is only one node, so asking about // assigned_on_exit() is not meaningful. let is_assigned = if ln == self.s.exit_ln { diff --git a/src/librustc_borrowck/borrowck/check_loans.rs b/src/librustc_borrowck/borrowck/check_loans.rs index f6bb51a26ad..b460c0ec4d0 100644 --- a/src/librustc_borrowck/borrowck/check_loans.rs +++ b/src/librustc_borrowck/borrowck/check_loans.rs @@ -718,8 +718,8 @@ fn check_if_path_is_moved(&self, /// /// For example: /// - /// ``` - /// let a: int; + /// ```ignore + /// let a: isize; /// a = 10; // ok, even though a is uninitialized /// /// struct Point { x: usize, y: usize } diff --git a/src/librustc_borrowck/borrowck/gather_loans/mod.rs b/src/librustc_borrowck/borrowck/gather_loans/mod.rs index 083cc972cca..f3addf381e0 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/mod.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/mod.rs @@ -486,7 +486,9 @@ pub fn compute_kill_scope(&self, loan_scope: region::CodeExtent, lp: &LoanPath<' //! come about when variables of `&mut` type are re-borrowed, //! as in this example: //! - //! fn counter<'a>(v: &'a mut Foo) -> &'a mut uint { + //! struct Foo { counter: usize } + //! + //! fn counter<'a>(v: &'a mut Foo) -> &'a mut usize { //! &mut v.counter //! } //! diff --git a/src/librustc_trans/trans/debuginfo/doc.rs b/src/librustc_trans/trans/debuginfo/doc.rs index a91619b2f84..c7d9e3de5a1 100644 --- a/src/librustc_trans/trans/debuginfo/doc.rs +++ b/src/librustc_trans/trans/debuginfo/doc.rs @@ -66,7 +66,7 @@ //! //! ``` //! struct List { -//! value: int, +//! value: isize, //! tail: Option>, //! } //! ``` diff --git a/src/librustc_trans/trans/meth.rs b/src/librustc_trans/trans/meth.rs index 8449d63015e..795a56b2dcf 100644 --- a/src/librustc_trans/trans/meth.rs +++ b/src/librustc_trans/trans/meth.rs @@ -456,7 +456,7 @@ fn trans_trait_callee_from_llval<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, /// Generate a shim function that allows an object type like `SomeTrait` to /// implement the type `SomeTrait`. Imagine a trait definition: /// -/// trait SomeTrait { fn get(&self) -> int; ... } +/// trait SomeTrait { fn get(&self) -> isize; ... } /// /// And a generic bit of code: /// @@ -468,7 +468,7 @@ fn trans_trait_callee_from_llval<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, /// What is the value of `x` when `foo` is invoked with `T=SomeTrait`? /// The answer is that it is a shim function generated by this routine: /// -/// fn shim(t: &SomeTrait) -> int { +/// fn shim(t: &SomeTrait) -> isize { /// // ... call t.get() virtually ... /// } /// diff --git a/src/librustc_typeck/check/regionck.rs b/src/librustc_typeck/check/regionck.rs index 549824d22a4..4f897d91b07 100644 --- a/src/librustc_typeck/check/regionck.rs +++ b/src/librustc_typeck/check/regionck.rs @@ -59,7 +59,7 @@ //! There are a number of troublesome scenarios in the tests //! `region-dependent-*.rs`, but here is one example: //! -//! struct Foo { i: int } +//! struct Foo { i: isize } //! struct Bar { foo: Foo } //! fn get_i(x: &'a Bar) -> &'a int { //! let foo = &x.foo; // Lifetime L1 @@ -233,8 +233,8 @@ fn set_repeating_scope(&mut self, scope: ast::NodeId) -> ast::NodeId { /// Consider this silly example: /// /// ``` - /// fn borrow(x: &int) -> &int {x} - /// fn foo(x: @int) -> int { // block: B + /// fn borrow(x: &int) -> &isize {x} + /// fn foo(x: @int) -> isize { // block: B /// let b = borrow(x); // region: /// *b /// } @@ -243,7 +243,7 @@ fn set_repeating_scope(&mut self, scope: ast::NodeId) -> ast::NodeId { /// Here, the region of `b` will be ``. `` is constrained to be some subregion of the /// block B and some superregion of the call. If we forced it now, we'd choose the smaller /// region (the call). But that would make the *b illegal. Since we don't resolve, the type - /// of b will be `&.int` and then `*b` will require that `` be bigger than the let and + /// of b will be `&.isize` and then `*b` will require that `` be bigger than the let and /// the `*b` expression, so we will effectively resolve `` to be the block B. pub fn resolve_type(&self, unresolved_ty: Ty<'tcx>) -> Ty<'tcx> { self.fcx.infcx().resolve_type_vars_if_possible(&unresolved_ty) diff --git a/src/librustc_typeck/variance.rs b/src/librustc_typeck/variance.rs index c9035bdff71..910f3b713cf 100644 --- a/src/librustc_typeck/variance.rs +++ b/src/librustc_typeck/variance.rs @@ -172,14 +172,14 @@ //! //! Now imagine that I have an implementation of `ConvertTo` for `Object`: //! -//! impl ConvertTo for Object { ... } +//! impl ConvertTo for Object { ... } //! //! And I want to call `convertAll` on an array of strings. Suppose //! further that for whatever reason I specifically supply the value of //! `String` for the type parameter `T`: //! //! let mut vector = vec!["string", ...]; -//! convertAll::(vector); +//! convertAll::(vector); //! //! Is this legal? To put another way, can we apply the `impl` for //! `Object` to the type `String`? The answer is yes, but to see why @@ -190,7 +190,7 @@ //! - It will then call the impl of `convertTo()` that is intended //! for use with objects. This has the type: //! -//! fn(self: &Object) -> int +//! fn(self: &Object) -> isize //! //! It is ok to provide a value for `self` of type `&String` because //! `&String <: &Object`. @@ -198,17 +198,17 @@ //! OK, so intuitively we want this to be legal, so let's bring this back //! to variance and see whether we are computing the correct result. We //! must first figure out how to phrase the question "is an impl for -//! `Object,int` usable where an impl for `String,int` is expected?" +//! `Object,isize` usable where an impl for `String,isize` is expected?" //! //! Maybe it's helpful to think of a dictionary-passing implementation of //! type classes. In that case, `convertAll()` takes an implicit parameter //! representing the impl. In short, we *have* an impl of type: //! -//! V_O = ConvertTo for Object +//! V_O = ConvertTo for Object //! //! and the function prototype expects an impl of type: //! -//! V_S = ConvertTo for String +//! V_S = ConvertTo for String //! //! As with any argument, this is legal if the type of the value given //! (`V_O`) is a subtype of the type expected (`V_S`). So is `V_O <: V_S`? @@ -217,7 +217,7 @@ //! covariant, it means that: //! //! V_O <: V_S iff -//! int <: int +//! isize <: isize //! String <: Object //! //! These conditions are satisfied and so we are happy.